mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update lazy loader
This commit is contained in:
Luke Pulverenti
parent
0291450ffb
commit
71b0be28b8
8 changed files with 226 additions and 126 deletions
|
|
@ -22,34 +22,32 @@
|
|||
}
|
||||
}
|
||||
|
||||
function loadSection(page, user, displayPreferences, index) {
|
||||
function loadSection(page, user, userSettings, index) {
|
||||
|
||||
var userId = user.Id;
|
||||
|
||||
var section = displayPreferences.CustomPrefs['home' + index] || getDefaultSection(index);
|
||||
var section = userSettings.get('homesection' + index) || getDefaultSection(index);
|
||||
|
||||
if (section == 'folders') {
|
||||
section = defaultFirstSection;
|
||||
}
|
||||
|
||||
var showLibraryTileNames = displayPreferences.CustomPrefs.enableLibraryTileNames != '0';
|
||||
|
||||
var elem = page.querySelector('.section' + index);
|
||||
|
||||
if (section == 'latestmedia') {
|
||||
return Sections.loadRecentlyAdded(elem, user);
|
||||
}
|
||||
else if (section == 'librarytiles') {
|
||||
return Sections.loadLibraryTiles(elem, user, 'backdrop', index, false, showLibraryTileNames);
|
||||
return Sections.loadLibraryTiles(elem, user, 'backdrop', index, false);
|
||||
}
|
||||
else if (section == 'smalllibrarytiles') {
|
||||
return Sections.loadLibraryTiles(elem, user, 'smallBackdrop', index, false, showLibraryTileNames);
|
||||
return Sections.loadLibraryTiles(elem, user, 'smallBackdrop', index, false);
|
||||
}
|
||||
else if (section == 'smalllibrarytiles-automobile') {
|
||||
return Sections.loadLibraryTiles(elem, user, 'smallBackdrop', index, true, showLibraryTileNames);
|
||||
return Sections.loadLibraryTiles(elem, user, 'smallBackdrop', index, true);
|
||||
}
|
||||
else if (section == 'librarytiles-automobile') {
|
||||
return Sections.loadLibraryTiles(elem, user, 'backdrop', index, true, showLibraryTileNames);
|
||||
return Sections.loadLibraryTiles(elem, user, 'backdrop', index, true);
|
||||
}
|
||||
else if (section == 'librarybuttons') {
|
||||
return Sections.loadlibraryButtons(elem, userId, index);
|
||||
|
|
@ -77,7 +75,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
function loadSections(page, user, displayPreferences) {
|
||||
function loadSections(page, user, userSettings) {
|
||||
|
||||
var i, length;
|
||||
var sectionCount = 5;
|
||||
|
|
@ -98,7 +96,7 @@
|
|||
|
||||
for (i = 0, length = sectionCount; i < length; i++) {
|
||||
|
||||
promises.push(loadSection(page, user, displayPreferences, i));
|
||||
promises.push(loadSection(page, user, userSettings, i));
|
||||
}
|
||||
|
||||
return Promise.all(promises);
|
||||
|
|
@ -186,24 +184,37 @@
|
|||
});
|
||||
}
|
||||
|
||||
function getRequirePromise(deps) {
|
||||
|
||||
return new Promise(function (resolve, reject) {
|
||||
|
||||
require(deps, resolve);
|
||||
});
|
||||
}
|
||||
|
||||
function loadHomeTab(page, tabContent) {
|
||||
|
||||
if (window.ApiClient) {
|
||||
var userId = Dashboard.getCurrentUserId();
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
getDisplayPreferences('home', userId).then(function (result) {
|
||||
var promises = [
|
||||
getDisplayPreferences('home', userId),
|
||||
Dashboard.getCurrentUser(),
|
||||
getRequirePromise(['userSettings'])
|
||||
];
|
||||
|
||||
Dashboard.getCurrentUser().then(function (user) {
|
||||
Promise.all(promises).then(function(responses) {
|
||||
var displayPreferences = responses[0];
|
||||
var user = responses[1];
|
||||
var userSettings = responses[2];
|
||||
|
||||
loadSections(tabContent, user, result).then(function () {
|
||||
|
||||
if (!AppInfo.isNativeApp) {
|
||||
showWelcomeIfNeeded(page, result);
|
||||
}
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
loadSections(tabContent, user, userSettings).then(function () {
|
||||
|
||||
if (!AppInfo.isNativeApp) {
|
||||
showWelcomeIfNeeded(page, displayPreferences);
|
||||
}
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@
|
|||
html += '<div class="sidebarDivider"></div>';
|
||||
|
||||
if (user.localUser && (AppInfo.isNativeApp && browserInfo.android)) {
|
||||
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="return LibraryMenu.onLinkClicked(event, this);" href="mypreferencesmenu.html?userId=' + user.localUser.Id + '"><i class="md-icon sidebarLinkIcon">settings</i><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
|
||||
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="return LibraryMenu.onLinkClicked(event, this);" href="mypreferencesmenu.html"><i class="md-icon sidebarLinkIcon">settings</i><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';
|
||||
}
|
||||
|
||||
html += '<a class="sidebarLink lnkMediaFolder lnkManageOffline" data-itemid="manageoffline" onclick="return LibraryMenu.onLinkClicked(event, this);" href="mysync.html?mode=offline"><i class="md-icon sidebarLinkIcon">file_download</i><span class="sidebarLinkText">' + Globalize.translate('ManageOfflineDownloads') + '</span></a>';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
define(['listViewStyle'], function () {
|
||||
define(['userSettingsBuilder', 'listViewStyle'], function (userSettingsBuilder) {
|
||||
'use strict';
|
||||
|
||||
function renderViews(page, user, result) {
|
||||
|
|
@ -113,14 +113,14 @@
|
|||
page.querySelector('.viewOrderList').innerHTML = html;
|
||||
}
|
||||
|
||||
function loadForm(page, user, displayPreferences) {
|
||||
function loadForm(page, user, userSettings) {
|
||||
|
||||
page.querySelector('.chkHidePlayedFromLatest').checked = user.Configuration.HidePlayedInLatest || false;
|
||||
|
||||
page.querySelector('#selectHomeSection1').value = displayPreferences.CustomPrefs.home0 || '';
|
||||
page.querySelector('#selectHomeSection2').value = displayPreferences.CustomPrefs.home1 || '';
|
||||
page.querySelector('#selectHomeSection3').value = displayPreferences.CustomPrefs.home2 || '';
|
||||
page.querySelector('#selectHomeSection4').value = displayPreferences.CustomPrefs.home3 || '';
|
||||
page.querySelector('#selectHomeSection1').value = userSettings.get('homesection0') || '';
|
||||
page.querySelector('#selectHomeSection2').value = userSettings.get('homesection1') || '';
|
||||
page.querySelector('#selectHomeSection3').value = userSettings.get('homesection2') || '';
|
||||
page.querySelector('#selectHomeSection4').value = userSettings.get('homesection3') || '';
|
||||
|
||||
var promise1 = ApiClient.getUserViews({}, user.Id);
|
||||
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/GroupingOptions"));
|
||||
|
|
@ -135,14 +135,6 @@
|
|||
});
|
||||
}
|
||||
|
||||
function displayPreferencesKey() {
|
||||
if (AppInfo.isNativeApp) {
|
||||
return 'Emby Mobile';
|
||||
}
|
||||
|
||||
return 'webclient';
|
||||
}
|
||||
|
||||
function getCheckboxItems(selector, page, isChecked) {
|
||||
|
||||
var inputs = page.querySelectorAll(selector);
|
||||
|
|
@ -159,7 +151,7 @@
|
|||
return list;
|
||||
}
|
||||
|
||||
function saveUser(page, user, displayPreferences) {
|
||||
function saveUser(page, user, userSettings) {
|
||||
|
||||
user.Configuration.HidePlayedInLatest = page.querySelector('.chkHidePlayedFromLatest').checked;
|
||||
|
||||
|
|
@ -183,18 +175,15 @@
|
|||
|
||||
user.Configuration.OrderedViews = orderedViews;
|
||||
|
||||
displayPreferences.CustomPrefs.home0 = page.querySelector('#selectHomeSection1').value;
|
||||
displayPreferences.CustomPrefs.home1 = page.querySelector('#selectHomeSection2').value;
|
||||
displayPreferences.CustomPrefs.home2 = page.querySelector('#selectHomeSection3').value;
|
||||
displayPreferences.CustomPrefs.home3 = page.querySelector('#selectHomeSection4').value;
|
||||
userSettings.set('homesection0', page.querySelector('#selectHomeSection1').value);
|
||||
userSettings.set('homesection1', page.querySelector('#selectHomeSection2').value);
|
||||
userSettings.set('homesection2', page.querySelector('#selectHomeSection3').value);
|
||||
userSettings.set('homesection3', page.querySelector('#selectHomeSection4').value);
|
||||
|
||||
return ApiClient.updateDisplayPreferences('home', displayPreferences, user.Id, displayPreferencesKey()).then(function () {
|
||||
|
||||
return ApiClient.updateUserConfiguration(user.Id, user.Configuration);
|
||||
});
|
||||
return ApiClient.updateUserConfiguration(user.Id, user.Configuration);
|
||||
}
|
||||
|
||||
function save(page, userId) {
|
||||
function save(page, userId, userSettings) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
|
|
@ -204,21 +193,17 @@
|
|||
|
||||
ApiClient.getUser(userId).then(function (user) {
|
||||
|
||||
ApiClient.getDisplayPreferences('home', user.Id, displayPreferencesKey()).then(function (displayPreferences) {
|
||||
saveUser(page, user, userSettings).then(function () {
|
||||
|
||||
saveUser(page, user, displayPreferences).then(function () {
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
if (!AppInfo.enableAutoSave) {
|
||||
require(['toast'], function (toast) {
|
||||
toast(Globalize.translate('SettingsSaved'));
|
||||
});
|
||||
}
|
||||
|
||||
}, function () {
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
Dashboard.hideLoadingMsg();
|
||||
if (!AppInfo.enableAutoSave) {
|
||||
require(['toast'], function (toast) {
|
||||
toast(Globalize.translate('SettingsSaved'));
|
||||
});
|
||||
}
|
||||
|
||||
}, function () {
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -257,14 +242,21 @@
|
|||
|
||||
return function (view, params) {
|
||||
|
||||
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
|
||||
var userId = params.userId || Dashboard.getCurrentUserId();
|
||||
var userSettings = new userSettingsBuilder();
|
||||
var userSettingsLoaded;
|
||||
|
||||
function onSubmit(e) {
|
||||
|
||||
save(view, userId);
|
||||
userSettings.setUserInfo(userId, ApiClient).then(function () {
|
||||
|
||||
save(view, userId, userSettings);
|
||||
});
|
||||
|
||||
// Disable default form submission
|
||||
e.preventDefault();
|
||||
if (e) {
|
||||
e.preventDefault();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -329,19 +321,18 @@
|
|||
|
||||
ApiClient.getUser(userId).then(function (user) {
|
||||
|
||||
ApiClient.getDisplayPreferences('home', user.Id, displayPreferencesKey()).then(function (result) {
|
||||
userSettings.setUserInfo(userId, ApiClient).then(function () {
|
||||
|
||||
loadForm(page, user, result);
|
||||
userSettingsLoaded = true;
|
||||
|
||||
loadForm(page, user, userSettings);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
view.addEventListener('viewbeforehide', function () {
|
||||
var page = this;
|
||||
|
||||
if (AppInfo.enableAutoSave) {
|
||||
save(page, userId);
|
||||
onSubmit();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@
|
|||
});
|
||||
}
|
||||
|
||||
function loadLibraryTiles(elem, user, shape, index, autoHideOnMobile, showTitles) {
|
||||
function loadLibraryTiles(elem, user, shape, index, autoHideOnMobile) {
|
||||
|
||||
return getUserViews(user.Id).then(function (items) {
|
||||
|
||||
|
|
@ -418,7 +418,7 @@
|
|||
html += cardBuilder.getCardsHtml({
|
||||
items: items,
|
||||
shape: scrollX ? 'overflowBackdrop' : shape,
|
||||
showTitle: showTitles,
|
||||
showTitle: true,
|
||||
centerText: true,
|
||||
overlayText: false,
|
||||
lazy: true,
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ var Dashboard = {
|
|||
|
||||
showUserFlyout: function () {
|
||||
|
||||
Dashboard.navigate('mypreferencesmenu.html?userId=' + ApiClient.getCurrentUserId());
|
||||
Dashboard.navigate('mypreferencesmenu.html');
|
||||
},
|
||||
|
||||
getPluginSecurityInfo: function () {
|
||||
|
|
@ -1222,7 +1222,11 @@ var AppInfo = {};
|
|||
|
||||
define("libjass", [bowerPath + "/libjass/libjass.min", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency);
|
||||
|
||||
define("lazyLoader", [embyWebComponentsBowerPath + "/images/lazyloader"], returnFirstDependency);
|
||||
if (window.IntersectionObserver) {
|
||||
define("lazyLoader", [embyWebComponentsBowerPath + "/lazyloader/lazyloader-intersectionobserver"], returnFirstDependency);
|
||||
} else {
|
||||
define("lazyLoader", [embyWebComponentsBowerPath + "/lazyloader/lazyloader-scroll"], returnFirstDependency);
|
||||
}
|
||||
define("imageLoader", [embyWebComponentsBowerPath + "/images/imagehelper"], returnFirstDependency);
|
||||
define("syncJobList", ["components/syncjoblist/syncjoblist"], returnFirstDependency);
|
||||
define("appfooter", ["components/appfooter/appfooter"], returnFirstDependency);
|
||||
|
|
@ -1543,7 +1547,7 @@ var AppInfo = {};
|
|||
};
|
||||
|
||||
embyRouter.showSettings = function () {
|
||||
Dashboard.navigate('mypreferencesmenu.html?userId=' + ApiClient.getCurrentUserId());
|
||||
Dashboard.navigate('mypreferencesmenu.html');
|
||||
};
|
||||
|
||||
embyRouter.showGuide = function () {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue