web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-31 03:11:11 +02:00
Code Releases Activity

Close GH-887: Fix to reuse HTML5 tech (2). Fixes #884

Browse Source
This commit is contained in:
Benoit Tremblay 2013-12-11 13:27:47 -08:00 committed by Steve Heffernan
parent 7b23576afc
commit 6b73df950e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/media/html5.js
View File

@ -22,6 +22,7 @@ vjs.Html5 = vjs.MediaTechController.extend({
this.features['fullscreenResize'] = true;
vjs.MediaTechController.call(this, player, options, ready);
this.setupTriggers();
var source = options['source'];
@ -54,7 +55,6 @@ vjs.Html5 = vjs.MediaTechController.extend({
}
});
this.setupTriggers();
this.triggerReady();
}
});

6
src/js/player.js
View File

@ -247,10 +247,10 @@ vjs.Player.prototype.loadTech = function(techName, source){
// Pause and remove current playback technology
if (this.tech) {
this.unloadTech();
}
// if this is the first time loading, HTML5 tag will exist but won't be initialized
// so we need to remove it if we're not loading HTML5
} else if (techName !== 'Html5' && this.tag) {
// get rid of the HTML5 video tag as soon as we are using another tech
if (techName !== 'Html5' && this.tag) {
vjs.Html5.disposeMediaElement(this.tag);
this.tag = null;
}