milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed video stop issue

Browse source
This commit is contained in:
Techywarrior 2013-03-25 17:56:31 -07:00
parent 031afb1b8e
commit 78e7572d76
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/scripts/Extensions.js
View file

@ -483,7 +483,7 @@ _V_.ResolutionMenuItem = _V_.MenuItem.extend({
jQuery( this.player.controlBar.el ).find( '.vjs-quality-text' ).html( this.options.label );
// Change the source and make sure we don't start the video over
var currentSrc = $("#"+this.options.src[0].vid_id).find('video').attr("src");
var currentSrc = this.player.tag.src;
var newSrc = currentSrc.replace("videoBitrate="+resolutions[this.player.options.currentResolution],"videoBitrate="+resolutions[this.options.src[0].res]);
if (this.player.duration() == "Infinity") {
@ -657,7 +657,7 @@ _V_.ChapterMenuItem = _V_.MenuItem.extend({
//jQuery( this.player.controlBar.el ).find( '.vjs-chapter-text' ).html( this.options.label );
if (this.player.duration() == "Infinity") {
var currentSrc = $("#"+this.options.src[0].vid_id).find('video').attr("src");
var currentSrc = this.player.tag.src;
if (currentSrc.indexOf("StartTimeTicks") >= 0) {
var newSrc = currentSrc.replace(new RegExp("StartTimeTicks=[0-9]+","g"),"StartTimeTicks="+this.options.src[0].StartPositionTicks);

19
dashboard-ui/scripts/MediaPlayer.js
View file

@ -186,8 +186,21 @@
var elem = MediaPlayer.mediaElement;
elem.pause();
elem.src = "";
//check if it's a video using VideoJS
if ($(elem).hasClass("vjs-tech")) {
var player = _V_("videoWindow");
if (player.techName == "html5") {
player.tag.src = "";
player.tech.removeTriggers();
player.load();
}
// player.tech.destroy();
player.destroy();
}else {
elem.pause();
elem.src = "";
}
$(elem).remove();
@ -229,7 +242,6 @@ var videoJSextension = {
vjs_source = {};
vjs_source.res = res;
vjs_source.vid_id = vid_id;
vjs_sources[i].push( vjs_source );
@ -253,7 +265,6 @@ var videoJSextension = {
vjs_chapter = {};
vjs_chapter.Name = chapter.Name + " (" + ticks_to_human(chapter.StartPositionTicks) + ")";
vjs_chapter.StartPositionTicks = chapter.StartPositionTicks;
vjs_chapter.vid_id = vid_id;
vjs_chapters[i].push( vjs_chapter );