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 channels

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-21 11:55:11 -04:00
parent e17ea4ac1e
commit 949a67054f
4 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -25,14 +25,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.0.3", "_release": "1.0.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.3", "tag": "v1.0.3",
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

6
dashboard-ui/bower_components/iron-overlay-behavior/.bower.json vendored
View file

@ -34,14 +34,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-overlay-behavior", "homepage": "https://github.com/PolymerElements/iron-overlay-behavior",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "f03cea265587c724cf3a85aef76b2ab7ccfd2b94" "commit": "f03cea265587c724cf3a85aef76b2ab7ccfd2b94"
}, },
"_source": "git://github.com/polymerelements/iron-overlay-behavior.git", "_source": "git://github.com/PolymerElements/iron-overlay-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-overlay-behavior" "_originalSource": "PolymerElements/iron-overlay-behavior"
} }

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

@ -946,17 +946,15 @@
// This will start the transcoding process before actually feeding the video url into the player // This will start the transcoding process before actually feeding the video url into the player
if ($.browser.safari && !mediaSource.RunTimeTicks) { if ($.browser.safari && !mediaSource.RunTimeTicks) {
Dashboard.showLoadingMsg(); Dashboard.showModalLoadingMsg();
ApiClient.ajax({ ApiClient.ajax({
type: 'GET', type: 'GET',
url: streamInfo.url.replace('master.m3u8', 'live.m3u8') url: streamInfo.url.replace('master.m3u8', 'live.m3u8')
}).always(function () {
Dashboard.hideLoadingMsg();
}).done(function () { }).done(function () {
self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback); self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
}).fail(function() {
Dashboard.hideModalLoadingMsg();
}); });
} else { } else {
@ -1059,6 +1057,8 @@
}).one("playing.mediaplayerevent", function () { }).one("playing.mediaplayerevent", function () {
Dashboard.hideModalLoadingMsg();
// For some reason this is firing at the start, so don't bind until playback has begun // For some reason this is firing at the start, so don't bind until playback has begun
$(this).on("ended", self.onPlaybackStopped).one('ended', self.playNextAfterEnded); $(this).on("ended", self.onPlaybackStopped).one('ended', self.playNextAfterEnded);
@ -1091,6 +1091,7 @@
}).on("error.mediaplayerevent", function () { }).on("error.mediaplayerevent", function () {
Dashboard.hideModalLoadingMsg();
self.stop(); self.stop();
var errorMsg = Globalize.translate('MessageErrorPlayingVideo'); var errorMsg = Globalize.translate('MessageErrorPlayingVideo');

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

@ -1018,7 +1018,6 @@
function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) { function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) {
Dashboard.hideModalLoadingMsg();
self.currentMediaSource = mediaSource; self.currentMediaSource = mediaSource;
self.currentItem = item; self.currentItem = item;
@ -1031,6 +1030,7 @@
} else if (item.MediaType === "Audio") { } else if (item.MediaType === "Audio") {
Dashboard.hideModalLoadingMsg();
playAudio(item, self.currentMediaSource, startPosition, callback); playAudio(item, self.currentMediaSource, startPosition, callback);
} }
} }