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

update polymer

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-09 23:00:03 -04:00
parent 568fabb9ca
commit 319d838d6e
48 changed files with 3045 additions and 2348 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -545,14 +545,14 @@
// viblast can help us here
//return true;
//return window.MediaSource != null;
return window.MediaSource != null;
}
if ($.browser.msie) {
// viblast can help us here
//return true;
//return window.MediaSource != null;
return window.MediaSource != null;
}
return false;
@ -742,6 +742,8 @@
self.play = function (options) {
Dashboard.showLoadingMsg();
Dashboard.getCurrentUser().done(function (user) {
if (options.items) {
@ -775,6 +777,11 @@
var firstItem = items[0];
if (firstItem.MediaType === "Video") {
Dashboard.showModalLoadingMsg();
}
if (options.startPositionTicks || firstItem.MediaType !== 'Video') {
self.playInternal(firstItem, options.startPositionTicks, function () {
@ -929,6 +936,7 @@
}
if (item.IsPlaceHolder) {
Dashboard.hideModalLoadingMsg();
MediaController.showPlaybackInfoErrorMessage('PlaceHolder');
return;
}
@ -1666,7 +1674,13 @@
function sendProgressUpdate() {
var state = self.getPlayerStateInternal(self.currentMediaRenderer, self.currentItem, self.currentMediaSource);
var mediaRenderer = self.currentMediaRenderer;
if (mediaRenderer.enableProgressReporting === false) {
return;
}
var state = self.getPlayerStateInternal(mediaRenderer, self.currentItem, self.currentMediaSource);
var info = {
QueueableMediaTypes: state.NowPlayingItem.MediaType,