Skip to content

Commit

Permalink
Merge branch 'hotfix/undefined-source-fix' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
heff committed Jan 12, 2012
2 parents 6def502 + 855f513 commit ff2d59f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion VERSION.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
major: 3
patch: 3
patch: 4
minor: 0
8 changes: 4 additions & 4 deletions src/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit ff2d59f

Please sign in to comment.