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 popups

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-02 22:20:52 -05:00
parent ae5ccc79dc
commit a5be57afdc
19 changed files with 255 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dashboard-ui/scripts/channelitems.js
View file

@ -68,7 +68,7 @@
function reloadItems(page) {
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
var channelId = getParameterByName('id');
var folderId = getParameterByName('folderId');
@ -145,11 +145,11 @@
showSortMenu(page);
});
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
}, function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
});
}

9
dashboard-ui/scripts/mediacontroller.js
View file

@ -64,7 +64,7 @@
});
}
function showPlayerSelection() {
function showPlayerSelection(button) {
var playerInfo = MediaController.getPlayerInfo();
@ -73,7 +73,7 @@
return;
}
Dashboard.showModalLoadingMsg();
Dashboard.showLoadingMsg();
MediaController.getTargets().then(function (targets) {
@ -95,11 +95,12 @@
require(['actionsheet'], function () {
Dashboard.hideModalLoadingMsg();
Dashboard.hideLoadingMsg();
ActionSheetElement.show({
title: Globalize.translate('HeaderSelectPlayer'),
items: menuItems,
positionTo: button,
callback: function (id) {
var target = targets.filter(function (t) {
@ -1011,7 +1012,7 @@
function onCastButtonClicked() {
showPlayerSelection();
showPlayerSelection(this);
}
document.addEventListener('headercreated', function () {

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

@ -990,7 +990,7 @@
var keyframes = [
{ opacity: '1', offset: 0 },
{ opacity: '0', offset: 1 }];
var timing = { duration: 400, iterations: 1, easing: 'ease-out' };
var timing = { duration: 600, iterations: 1, easing: 'ease-out' };
elem.animate(keyframes, timing).onfinish = onfinish;
});
}