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 access denied exceptions

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-25 22:31:13 -04:00
parent 294281602e
commit ad38cf4783
17 changed files with 154 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -256,7 +256,7 @@
var link = '<a href="http://emby.media" target="_blank">http://emby.media</a>';
$('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link));
}).on('pageshowready', "#connectLoginPage", function () {
}).on('pageshow', "#connectLoginPage", function () {
var page = this;
loadPage(page);

10
dashboard-ui/scripts/dashboardpage.js
View file

@ -1003,7 +1003,7 @@
}
};
$(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
$(document).on('pageshow', "#dashboardPage", DashboardPage.onPageShow).on('pagebeforehide', "#dashboardPage", DashboardPage.onPageHide);
(function ($, document, window) {
@ -1287,7 +1287,7 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('
result.CustomPrefs[welcomeTourKey] = welcomeDismissValue;
ApiClient.updateDisplayPreferences('dashboard', result, userId, 'dashboard');
$(page).off('pageshowready', onPageShowReadyCheckTour);
$(page).off('pageshow', onPageShowCheckTour);
});
}
@ -1344,7 +1344,7 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('
});
}
function onPageShowReadyCheckTour() {
function onPageShowCheckTour() {
var page = this;
var apiClient = ApiClient;
@ -1362,13 +1362,13 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('
takeTour(page, Dashboard.getCurrentUserId());
});
}).on('pageshowready', "#dashboardPage", onPageShowReadyCheckTour);
}).on('pageshow', "#dashboardPage", onPageShowCheckTour);
})(jQuery, document, window);
(function () {
$(document).on('pageshowready', ".type-interior", function () {
$(document).on('pageshow', ".type-interior", function () {
var page = this;

4
dashboard-ui/scripts/librarybrowser.js
View file

@ -250,7 +250,7 @@
$('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight');
}
$(ownerpage).on('pageshow', LibraryBrowser.onTabbedpagebeforeshow);
$(ownerpage).on('pagebeforeshow', LibraryBrowser.onTabbedpagebeforeshow);
pages.addEventListener('iron-select', function () {
// When transition animations are used, add a content loading delay to allow the animations to finish
@ -406,7 +406,7 @@
afterNavigate.call($($.mobile.activePage)[0]);
} else {
$(document).one('pageshow', '.page', afterNavigate);
$(document).one('pagebeforeshow', '.page', afterNavigate);
Dashboard.navigate(url);
}
},

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

@ -249,9 +249,13 @@
}
Events.on(player, 'playbackstop', onPlaybackStop);
Events.on(player, 'playbackstart', onPlaybackStart);
Events.on(player, 'beforeplaybackstart', onBeforePlaybackStart);
};
function onBeforePlaybackStart(e, state) {
$(self).trigger('beforeplaybackstart', [state, this]);
}
function onPlaybackStart(e, state) {
$(self).trigger('playbackstart', [state, this]);
}
@ -450,7 +454,12 @@
return deferred.promise();
};
function doWithPlaybackValidation(fn) {
function doWithPlaybackValidation(player, fn) {
if (!player.isLocalPlayer) {
fn();
return;
}
requirejs(["scripts/registrationservices"], function () {
RegistrationServices.validateFeature('playback').done(fn);
@ -479,7 +488,7 @@
self.play = function (options) {
doWithPlaybackValidation(function () {
doWithPlaybackValidation(currentPlayer, function () {
if (typeof (options) === 'string') {
options = { ids: [options] };
}
@ -490,13 +499,13 @@
self.shuffle = function (id) {
doWithPlaybackValidation(function () {
doWithPlaybackValidation(currentPlayer, function () {
currentPlayer.shuffle(id);
});
};
self.instantMix = function (id) {
doWithPlaybackValidation(function () {
doWithPlaybackValidation(currentPlayer, function () {
currentPlayer.instantMix(id);
});
};

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

@ -1078,6 +1078,8 @@
mediaRenderer.init().done(function () {
self.onBeforePlaybackStart(mediaRenderer, item, mediaSource);
self.setSrcIntoRenderer(mediaRenderer, streamInfo, item, self.currentMediaSource);
self.streamInfo = streamInfo;

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

@ -1721,6 +1721,13 @@
// Nothing to setup here
};
self.onBeforePlaybackStart = function (mediaRenderer, item, mediaSource) {
var state = self.getPlayerStateInternal(mediaRenderer, item, mediaSource);
Events.trigger(self, 'beforeplaybackstart', [state]);
};
self.onPlaybackStart = function (mediaRenderer, item, mediaSource) {
var state = self.getPlayerStateInternal(mediaRenderer, item, mediaSource);
@ -1942,6 +1949,8 @@
// Set volume first to avoid an audible change
mediaRenderer.volume(initialVolume);
self.onBeforePlaybackStart(mediaRenderer, item, mediaSource);
mediaRenderer.setCurrentSrc(streamInfo, item, mediaSource);
self.streamInfo = streamInfo;
});

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

@ -777,8 +777,10 @@
if (AppInfo.enableNowPlayingPageBottomTabs) {
tabs.alignBottom = true;
tabs.classList.add('bottom');
//page.classList.add('noSecondaryNavPage');
} else {
tabs.classList.remove('bottom');
//page.classList.remove('noSecondaryNavPage');
}
LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelectorAll('neon-animated-pages')[0]);

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

@ -59,6 +59,10 @@
return enableScrollX() ? 'overflowPortrait' : 'portrait';
}
function getSquareShape() {
return enableScrollX() ? 'overflowSquare' : 'square';
}
function getLibraryButtonsHtml(items) {
var html = "";
@ -612,9 +616,14 @@
html += '</div>';
}
if (enableScrollX()) {
html += '<div class="hiddenScrollX itemsContainer">';
} else {
html += '<div class="itemsContainer">';
}
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "autohome",
shape: getSquareShape(),
showTitle: true,
showParentTitle: true,
coverImage: true,
@ -622,9 +631,11 @@
showDetailsMenu: true,
centerText: true
});
html += '</div>';
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
$(elem).createCardMenus();
});
}

8
dashboard-ui/scripts/site.js
View file

@ -1747,11 +1747,15 @@ var AppInfo = {};
AppInfo.enableNavDrawer = false;
AppInfo.enableSearchInTopMenu = false;
AppInfo.enableHomeFavorites = false;
AppInfo.enableNowPlayingBar = false;
AppInfo.enableCustomHomeSections = false;
AppInfo.enableHomeTabs = false;
AppInfo.enableNowPlayingPageBottomTabs = false;
// Disable the now playing bar for the iphone since we already have the now playing tab at the bottom
if (navigator.userAgent.toString().toLowerCase().indexOf('iphone') != -1) {
AppInfo.enableNowPlayingBar = false;
}
} else {
if (isMobile) {
@ -2479,8 +2483,6 @@ pageClassOn('pageshow', "page", function () {
}
}
Events.trigger(page, 'pageshowready');
Dashboard.ensureHeader(page);
if (apiClient && !apiClient.isWebSocketOpen()) {

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

@ -326,6 +326,8 @@
function reloadData(page) {
lastDataLoad = 0;
Dashboard.showLoadingMsg();
var options = {};
@ -344,9 +346,6 @@
loadData(page, response.Items);
setTimeout(function () {
loadData(page, response.Items);
}, 2000);
Dashboard.hideLoadingMsg();
});
@ -396,7 +395,6 @@
$(document).on('pageshow', ".syncActivityPage", function () {
var page = this;
lastDataLoad = 0;
Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {