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

Video fixes

Browse source 
Variable collision caused some issues - sorted
This commit is contained in:
Tim Hobbs 2014-04-08 16:12:09 -07:00
parent 874c0ce027
commit 32c1badcd9
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -872,18 +872,18 @@
$('#video-fullscreenButton', videoControls).show(); $('#video-fullscreenButton', videoControls).show();
} }
var videoElement = $("video", videoElement); var video = $("video", videoElement);
initialVolume = localStorage.getItem("volume") || 0.5; initialVolume = localStorage.getItem("volume") || 0.5;
videoElement.each(function () { video.each(function () {
this.volume = initialVolume; this.volume = initialVolume;
}); });
self.volumeSlider.val(initialVolume).slider('refresh'); self.volumeSlider.val(initialVolume).slider('refresh');
self.updateVolumeButtons(initialVolume); self.updateVolumeButtons(initialVolume);
videoElement.on("volumechange", function (e) { video.on("volumechange", function (e) {
var muted = this.muted; var muted = this.muted;
@ -899,13 +899,13 @@
}).on("play.once", function () { }).on("play.once", function () {
videoElement.off("play.once"); video.off("play.once");
}).on("playing.once", function () { }).on("playing.once", function () {
self.updateCanClientSeek(this); self.updateCanClientSeek(this);
videoElement.off("playing.once"); video.off("playing.once");
ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id, mediaSource.Id, true, item.MediaType); ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id, mediaSource.Id, true, item.MediaType);
@ -1037,7 +1037,7 @@
currentItem = item; currentItem = item;
currentMediaSource = mediaSource; currentMediaSource = mediaSource;
return videoElement[0]; return video[0];
} }
}; };
})(); })();