web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-02 06:32:07 +02:00
Code Releases Activity

Merge branch 'hotfix/undefined-source-fix' into stable

Browse Source
This commit is contained in:
Steve Heffernan 2012-01-12 14:30:14 -08:00
commit ff2d59fcf8
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -7,3 +7,6 @@ CHANGELOG
---- 3.0.3 / 2012-01-12 / doc-change -------------------------------------------
* Added line to docs to test zenflow
---- 3.0.4 / 2012-01-12 / undefined-source-fix ---------------------------------
* Fixing an undefined source when no sources exist on load

2
VERSION.yml
View File

@ -1,4 +1,4 @@
---
major: 3
patch: 3
patch: 4
minor: 0

8
src/player.js
View File

@ -199,11 +199,11 @@ _V_.Player = _V_.Component.extend({
// Grab tech-specific options from player options and add source and parent element to use.
var techOptions = _V_.merge({ source: source, parentEl: this.el }, this.options[techName])
if (source.src == this.values.src && this.values.currentTime > 0) {
techOptions.startTime = this.values.currentTime;
}
if (source) {
if (source.src == this.values.src && this.values.currentTime > 0) {
techOptions.startTime = this.values.currentTime;
}
this.values.src = source.src;
}