mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Tim Hobbs 2014-04-07 09:27:24 -07:00
commit a84e40f79e
3 changed files with 62 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/scripts/mediaplayer.js
View file

@ -60,8 +60,19 @@
return Math.floor(10000000 * (mediaElement || currentMediaElement).currentTime) + self.startTimeTicksOffset;
};
self.clearPauseStop = function() {
if (self.pauseStop) {
console.log('clearing pause stop timer');
window.clearTimeout(self.pauseStop);
self.pauseStop = null;
}
};
self.onPlaybackStopped = function () {
self.clearPauseStop();
$(this).off('ended.playbackstopped');
self.currentTimeElement.empty();
@ -1159,7 +1170,7 @@
var getItemFields = "MediaSources,Chapters";
self.getCurrentTargetInfo = function() {
self.getCurrentTargetInfo = function () {
return self.getTargets()[0];
};
}