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 components

Browse source
This commit is contained in:
Luke Pulverenti 2016-11-25 01:58:38 -05:00
parent 649fd0000d
commit 765af7e4d8
51 changed files with 184 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
define(['jQuery', 'cardBuilder', 'emby-itemscontainer'], function ($, cardBuilder) {
define(['jQuery', 'cardBuilder', 'imageLoader', 'emby-itemscontainer'], function ($, cardBuilder, imageLoader) {
'use strict';
var data = {};
@ -148,7 +148,7 @@
var elem = page.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder', 'emby-itemscontainer', 'emby-tabs', 'emby-button', 'scripts/channelslatest', 'scripts/sections'], function (libraryBrowser, cardBuilder) {
define(['libraryBrowser', 'cardBuilder', 'imageLoader', 'emby-itemscontainer', 'emby-tabs', 'emby-button', 'scripts/channelslatest', 'scripts/sections'], function (libraryBrowser, cardBuilder, imageLoader) {
'use strict';
// The base query options
@ -50,7 +50,7 @@
var elem = page.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
libraryBrowser.saveQueryValues('channels', query);

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

@ -1,4 +1,4 @@
define(['jQuery'], function ($) {
define(['jQuery', 'imageLoader'], function ($, imageLoader) {
'use strict';
// The base query options
@ -46,7 +46,7 @@ define(['jQuery'], function ($) {
var elem = page.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;

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

@ -1,4 +1,4 @@
define(['jQuery', 'listView'], function ($, listView) {
define(['jQuery', 'listView', 'imageLoader'], function ($, listView, imageLoader) {
'use strict';
var data = {};
@ -96,7 +96,7 @@ define(['jQuery', 'listView'], function ($, listView) {
var elem = page.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;

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

@ -1,4 +1,4 @@
define(['jQuery'], function ($) {
define(['jQuery', 'imageLoader'], function ($, imageLoader) {
'use strict';
$(document).on('pagebeforeshow', "#gamesRecommendedPage", function () {
@ -29,7 +29,7 @@ define(['jQuery'], function ($) {
lazy: true
});
ImageLoader.lazyChildren(recentlyAddedItems);
imageLoader.lazyChildren(recentlyAddedItems);
});
@ -64,7 +64,7 @@ define(['jQuery'], function ($) {
lazy: true
});
ImageLoader.lazyChildren(recentlyPlayedItems);
imageLoader.lazyChildren(recentlyPlayedItems);
});
});

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

@ -1,4 +1,4 @@
define(['jQuery'], function ($) {
define(['jQuery', 'imageLoader'], function ($, imageLoader) {
'use strict';
// The base query options
@ -47,7 +47,7 @@ define(['jQuery'], function ($) {
var elem = page.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;

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

@ -1,4 +1,4 @@
define(['jQuery'], function ($) {
define(['jQuery', 'imageLoader'], function ($, imageLoader) {
'use strict';
// The base query options
@ -42,7 +42,7 @@ define(['jQuery'], function ($) {
var elem = page.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);

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

@ -1,4 +1,4 @@
define(['components/categorysyncbuttons', 'cardBuilder', 'apphost', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder, appHost) {
define(['components/categorysyncbuttons', 'cardBuilder', 'apphost', 'imageLoader', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder, appHost, imageLoader) {
'use strict';
function getNextUpPromise() {
@ -46,7 +46,7 @@
var elem = page.querySelector('#nextUpItems');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
Dashboard.hideLoadingMsg();
});
}

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

@ -1,4 +1,4 @@
define(['datetime', 'cardBuilder', 'apphost', 'emby-itemscontainer', 'scrollStyles'], function (datetime, cardBuilder, appHost) {
define(['datetime', 'cardBuilder', 'apphost', 'imageLoader', 'emby-itemscontainer', 'scrollStyles'], function (datetime, cardBuilder, appHost, imageLoader) {
'use strict';
function getUpcomingPromise() {
@ -134,7 +134,7 @@
}
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
}
return function (view, params, tabContent) {

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

@ -1,4 +1,4 @@
define(['listView', 'cardBuilder', 'emby-itemscontainer'], function (listView, cardBuilder) {
define(['listView', 'cardBuilder', 'imageLoader', 'emby-itemscontainer'], function (listView, cardBuilder, imageLoader) {
'use strict';
function renderItems(page, item) {
@ -314,7 +314,7 @@
itemsContainer.innerHTML = html;
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
});
}

24
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1,4 +1,4 @@
define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost) {
define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader) {
'use strict';
var currentItem;
@ -125,7 +125,7 @@
backdrop.setBackdrops([item]);
}
else {
hasBackdrop = LibraryBrowser.renderDetailPageBackdrop(page, item);
hasBackdrop = LibraryBrowser.renderDetailPageBackdrop(page, item, imageLoader);
backdrop.clear();
}
@ -351,7 +351,7 @@
function renderImage(page, item, user) {
LibraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, user.Policy.IsAdministrator && item.MediaType != 'Photo');
LibraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, user.Policy.IsAdministrator && item.MediaType != 'Photo', null, imageLoader, indicators);
}
function refreshDetailImageUserData(elem, item) {
@ -411,7 +411,7 @@
var itemsContainer = section.querySelector('.nextUpItems');
itemsContainer.innerHTML = html;
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
});
}
@ -885,7 +885,7 @@
var similarContent = page.querySelector('#moreFromItems');
similarContent.innerHTML = html;
ImageLoader.lazyChildren(similarContent);
imageLoader.lazyChildren(similarContent);
});
}
@ -960,7 +960,7 @@
var similarContent = similarCollapsible.querySelector('.similarContent');
similarContent.innerHTML = html;
ImageLoader.lazyChildren(similarContent);
imageLoader.lazyChildren(similarContent);
});
}
@ -1190,7 +1190,7 @@
}
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
if (item.Type == "BoxSet") {
@ -1445,7 +1445,7 @@
var collectionItems = page.querySelector('.collectionItems');
collectionItems.insertAdjacentHTML('beforeend', html);
ImageLoader.lazyChildren(collectionItems);
imageLoader.lazyChildren(collectionItems);
collectionItems.querySelector('.btnAddToCollection').addEventListener('click', function () {
require(['alert'], function (alert) {
@ -1613,7 +1613,7 @@
var themeVideosContent = page.querySelector('#themeVideosContent');
themeVideosContent.innerHTML = getVideosHtml(items, user);
ImageLoader.lazyChildren(themeVideosContent);
imageLoader.lazyChildren(themeVideosContent);
} else {
page.querySelector('#themeVideosCollapsible').classList.add('hide');
}
@ -1637,7 +1637,7 @@
var musicVideosContent = page.querySelector('.musicVideosContent');
musicVideosContent.innerHTML = getVideosHtml(result.Items, user);
ImageLoader.lazyChildren(musicVideosContent);
imageLoader.lazyChildren(musicVideosContent);
} else {
page.querySelector('#musicVideosCollapsible').classList.add('hide');
@ -1656,7 +1656,7 @@
var additionalPartsContent = page.querySelector('#additionalPartsContent');
additionalPartsContent.innerHTML = getVideosHtml(result.Items, user);
ImageLoader.lazyChildren(additionalPartsContent);
imageLoader.lazyChildren(additionalPartsContent);
} else {
page.querySelector('#additionalPartsCollapsible').classList.add('hide');
@ -1890,7 +1890,7 @@
var specialsContent = page.querySelector('#specialsContent');
specialsContent.innerHTML = getVideosHtml(specials, user, limit, "moreSpecials");
ImageLoader.lazyChildren(specialsContent);
imageLoader.lazyChildren(specialsContent);
});
}

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'alphaPicker', 'listView', 'cardBuilder', 'emby-itemscontainer'], function (libraryBrowser, alphaPicker, listView, cardBuilder) {
define(['libraryBrowser', 'alphaPicker', 'listView', 'cardBuilder', 'imageLoader', 'emby-itemscontainer'], function (libraryBrowser, alphaPicker, listView, cardBuilder, imageLoader) {
'use strict';
return function (view, params) {
@ -161,7 +161,7 @@
var elem = view.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
var i, length;
var elems = view.querySelectorAll('.paging');

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

@ -1,4 +1,4 @@
define(['viewManager', 'appSettings', 'appStorage', 'apphost', 'datetime', 'itemHelper', 'mediaInfo', 'scroller', 'indicators', 'dom', 'browser', 'imageLoader', 'scrollStyles'], function (viewManager, appSettings, appStorage, appHost, datetime, itemHelper, mediaInfo, scroller, indicators, dom, browser) {
define(['appSettings', 'dom', 'browser', 'scrollStyles'], function (appSettings, dom, browser) {
'use strict';
function fadeInRight(elem) {
@ -33,7 +33,7 @@
loadSavedQueryValues: function (key, query) {
var values = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId());
var values = appSettings.get(key + '_' + Dashboard.getCurrentUserId());
if (values) {
@ -57,7 +57,7 @@
}
try {
appStorage.setItem(key + '_' + Dashboard.getCurrentUserId(), JSON.stringify(values));
appSettings.set(key + '_' + Dashboard.getCurrentUserId(), JSON.stringify(values));
} catch (e) {
}
@ -66,7 +66,7 @@
saveViewSetting: function (key, value) {
try {
appStorage.setItem(key + '_' + Dashboard.getCurrentUserId() + '_view', value);
appSettings.set(key + '_' + Dashboard.getCurrentUserId() + '_view', value);
} catch (e) {
}
@ -74,7 +74,7 @@
getSavedView: function (key) {
var val = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId() + '_view');
var val = appSettings.get(key + '_' + Dashboard.getCurrentUserId() + '_view');
return val;
},
@ -202,7 +202,9 @@
if (window.location.href.toLowerCase().indexOf(url.toLowerCase()) != -1) {
afterNavigate.call(viewManager.currentView());
require(['viewManager'], function (viewManager) {
afterNavigate.call(viewManager.currentView());
});
} else {
pageClassOn('pageinit', 'page', afterNavigate);
@ -424,17 +426,19 @@
renderName: function (item, nameElem, linkToElement, context) {
var name = itemHelper.getDisplayName(item, {
includeParentInfo: false
require(['itemHelper'], function (itemHelper) {
var name = itemHelper.getDisplayName(item, {
includeParentInfo: false
});
LibraryMenu.setTitle(name);
if (linkToElement) {
nameElem.innerHTML = '<a class="detailPageParentLink" href="' + LibraryBrowser.getHref(item, context) + '">' + name + '</a>';
} else {
nameElem.innerHTML = name;
}
});
LibraryMenu.setTitle(name);
if (linkToElement) {
nameElem.innerHTML = '<a class="detailPageParentLink" href="' + LibraryBrowser.getHref(item, context) + '">' + name + '</a>';
} else {
nameElem.innerHTML = name;
}
},
renderParentName: function (item, parentNameElem, context) {
@ -536,7 +540,7 @@
if (limit && options.updatePageSizeSetting !== false) {
try {
appStorage.setItem(options.pageSizeKey || pageSizeKey, limit);
appSettings.set(options.pageSizeKey || pageSizeKey, limit);
} catch (e) {
}
@ -706,7 +710,7 @@
});
},
renderDetailImage: function (elem, item, editable, preferThumb) {
renderDetailImage: function (elem, item, editable, preferThumb, imageLoader, indicators) {
var imageTags = item.ImageTags || {};
@ -855,10 +859,10 @@
img.classList.add('loaded');
}
};
ImageLoader.lazyImage(img, url);
imageLoader.lazyImage(img, url);
},
renderDetailPageBackdrop: function (page, item) {
renderDetailPageBackdrop: function (page, item, imageLoader) {
var screenWidth = screen.availWidth;
@ -877,7 +881,7 @@
});
itemBackdropElement.classList.remove('noBackdrop');
ImageLoader.lazyImage(itemBackdropElement, imgUrl, false);
imageLoader.lazyImage(itemBackdropElement, imgUrl, false);
hasbackdrop = true;
}
else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
@ -890,7 +894,7 @@
});
itemBackdropElement.classList.remove('noBackdrop');
ImageLoader.lazyImage(itemBackdropElement, imgUrl, false);
imageLoader.lazyImage(itemBackdropElement, imgUrl, false);
hasbackdrop = true;
}
else {

24
dashboard-ui/scripts/librarymenu.js
View file

@ -1,4 +1,4 @@
define(['imageLoader', 'layoutManager', 'viewManager', 'libraryBrowser', 'apphost', 'embyRouter', 'paper-icon-button-light', 'material-icons'], function (imageLoader, layoutManager, viewManager, libraryBrowser, appHost, embyRouter) {
define(['layoutManager', 'viewManager', 'libraryBrowser', 'embyRouter', 'paper-icon-button-light', 'material-icons'], function (layoutManager, viewManager, libraryBrowser, embyRouter) {
'use strict';
var enableBottomTabs = AppInfo.isNativeApp;
@ -53,12 +53,18 @@
document.querySelector('.skinHeader').appendChild(viewMenuBar);
imageLoader.lazyChildren(document.querySelector('.viewMenuBar'));
lazyLoadViewMenuBarImages();
document.dispatchEvent(new CustomEvent("headercreated", {}));
bindMenuEvents();
}
function lazyLoadViewMenuBarImages() {
require(['imageLoader'], function (imageLoader) {
imageLoader.lazyChildren(document.querySelector('.viewMenuBar'));
});
}
function onBackClick() {
embyRouter.back();
@ -140,13 +146,11 @@
}
require(['apphost'], function (apphost) {
if (apphost.supports('voiceinput')) {
header.querySelector('.headerVoiceButton').classList.remove('hide');
} else {
header.querySelector('.headerVoiceButton').classList.add('hide');
}
});
} else {
@ -460,11 +464,13 @@
showBySelector('.lnkSyncToOtherDevices', false);
}
if (user.Policy.EnableSync && appHost.supports('sync')) {
showBySelector('.lnkManageOffline', true);
} else {
showBySelector('.lnkManageOffline', false);
}
require(['apphost'], function (appHost) {
if (user.Policy.EnableSync && appHost.supports('sync')) {
showBySelector('.lnkManageOffline', true);
} else {
showBySelector('.lnkManageOffline', false);
}
});
var userId = Dashboard.getCurrentUserId();

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

@ -1,4 +1,4 @@
define(['cardBuilder', 'emby-itemscontainer'], function (cardBuilder) {
define(['cardBuilder', 'imageLoader', 'emby-itemscontainer'], function (cardBuilder, imageLoader) {
'use strict';
return function (view, params, tabContent) {
@ -68,7 +68,7 @@
var elem = context.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
var i, length;
var elems;

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

@ -1,4 +1,4 @@
define(['cardBuilder', 'apphost', 'emby-itemscontainer'], function (cardBuilder, appHost) {
define(['cardBuilder', 'apphost', 'imageLoader', 'emby-itemscontainer'], function (cardBuilder, appHost, imageLoader) {
'use strict';
return function (view, params) {
@ -83,7 +83,7 @@
var elem = page.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
var i, length;
var elems;

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

@ -1,4 +1,4 @@
define(['components/categorysyncbuttons', 'cardBuilder', 'apphost', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder, appHost) {
define(['components/categorysyncbuttons', 'cardBuilder', 'apphost', 'imageLoader', 'scripts/livetvcomponents', 'emby-button', 'listViewStyle', 'emby-itemscontainer'], function (categorysyncbuttons, cardBuilder, appHost, imageLoader) {
'use strict';
function getRecordingGroupHtml(group) {
@ -96,7 +96,7 @@
}, cardOptions || {}));
ImageLoader.lazyChildren(recordingItems);
imageLoader.lazyChildren(recordingItems);
}
function getBackdropShape() {

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

@ -1,4 +1,4 @@
define(['cardBuilder', 'apphost', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (cardBuilder, appHost) {
define(['cardBuilder', 'apphost', 'imageLoader', 'scripts/livetvcomponents', 'emby-button', 'emby-itemscontainer'], function (cardBuilder, appHost, imageLoader) {
'use strict';
function enableScrollX() {
@ -40,7 +40,7 @@
}, cardOptions || {}));
ImageLoader.lazyChildren(recordingItems);
imageLoader.lazyChildren(recordingItems);
}
function getBackdropShape() {
@ -84,7 +84,7 @@
elem.querySelector('.recordingItems').innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}

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

@ -1,4 +1,4 @@
define(['datetime', 'dom', 'seriesRecordingEditor', 'listView', 'emby-itemscontainer'], function (datetime, dom, seriesRecordingEditor, listView) {
define(['datetime', 'dom', 'seriesRecordingEditor', 'listView', 'imageLoader', 'emby-itemscontainer'], function (datetime, dom, seriesRecordingEditor, listView, imageLoader) {
'use strict';
return function (view, params) {
@ -55,7 +55,7 @@
var scheduleTab = page.querySelector('.scheduleTab');
scheduleTab.innerHTML = html;
ImageLoader.lazyChildren(scheduleTab);
imageLoader.lazyChildren(scheduleTab);
});
}

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder', 'apphost', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, cardBuilder, appHost) {
define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, cardBuilder, appHost, imageLoader) {
'use strict';
function enableScrollX() {
@ -37,7 +37,7 @@
}, cardOptions || {}));
ImageLoader.lazyChildren(recordingItems);
imageLoader.lazyChildren(recordingItems);
}
function getBackdropShape() {
@ -225,7 +225,7 @@
var elem = page.querySelector('.' + sectionClass);
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
}
return function (view, params) {

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

@ -1,4 +1,4 @@
define(['appStorage', 'events', 'browser'], function (appStorage, events, browser) {
define(['appSettings', 'events', 'browser'], function (appSettings, events, browser) {
'use strict';
var currentDisplayInfo;
@ -512,7 +512,7 @@
if (enabled != null) {
var val = enabled ? '1' : '0';
appStorage.setItem('displaymirror--' + Dashboard.getCurrentUserId(), val);
appSettings.set('displaymirror--' + Dashboard.getCurrentUserId(), val);
if (enabled) {
mirrorIfEnabled();
@ -520,7 +520,7 @@
return;
}
return (appStorage.getItem('displaymirror--' + Dashboard.getCurrentUserId()) || '') != '0';
return (appSettings.get('displaymirror--' + Dashboard.getCurrentUserId()) || '') != '0';
};
self.play = function (options) {

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

@ -1,4 +1,4 @@
define(['appSettings', 'datetime', 'mediaInfo', 'browser', 'scrollStyles', 'paper-icon-button-light'], function (appSettings, datetime, mediaInfo, browser) {
define(['appSettings', 'datetime', 'mediaInfo', 'browser', 'imageLoader', 'scrollStyles', 'paper-icon-button-light'], function (appSettings, datetime, mediaInfo, browser, imageLoader) {
'use strict';
function createVideoPlayer(self) {
@ -426,11 +426,11 @@
width: 160,
shape: 'portrait'
});
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}
else {
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
}
function onTabButtonClick() {

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

@ -1,4 +1,4 @@
define(['appSettings', 'userSettings', 'appStorage', 'datetime', 'browser'], function (appSettings, userSettings, appStorage, datetime, browser) {
define(['appSettings', 'userSettings', 'datetime', 'browser'], function (appSettings, userSettings, datetime, browser) {
'use strict';
function mediaPlayer() {
@ -1095,13 +1095,13 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime', 'browser'], fun
self.saveVolume = function (val) {
if (val) {
appStorage.setItem("volume", val);
appSettings.set("volume", val);
}
};
self.getSavedVolume = function () {
return appStorage.getItem("volume") || 0.5;
return appSettings.get("volume") || 0.5;
};
self.shuffle = function (id) {

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'components/categorysyncbuttons', 'cardBuilder', 'dom', 'apphost', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, categorysyncbuttons, cardBuilder, dom, appHost) {
define(['libraryBrowser', 'components/categorysyncbuttons', 'cardBuilder', 'dom', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, categorysyncbuttons, cardBuilder, dom, appHost, imageLoader) {
'use strict';
function enableScrollX() {
@ -170,7 +170,7 @@
var recs = page.querySelector('.recommendations');
recs.innerHTML = html;
ImageLoader.lazyChildren(recs);
imageLoader.lazyChildren(recs);
});
}

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder', 'apphost'], function (libraryBrowser, cardBuilder, appHost) {
define(['libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader'], function (libraryBrowser, cardBuilder, appHost, imageLoader) {
'use strict';
return function (view, params, tabContent) {
@ -111,7 +111,7 @@
var elem = context.querySelector('#items');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
libraryBrowser.saveQueryValues(getSavedQueryKey(), query);

63
dashboard-ui/scripts/musicrecommended.js
View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, cardBuilder, dom, appHost) {
define(['libraryBrowser', 'cardBuilder', 'dom', 'apphost', 'imageLoader', 'libraryMenu', 'scrollStyles', 'emby-itemscontainer', 'emby-tabs', 'emby-button'], function (libraryBrowser, cardBuilder, dom, appHost, imageLoader, libraryMenu) {
'use strict';
function itemsPerRow() {
@ -53,7 +53,7 @@
vibrant: supportsImageAnalysis
});
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
Dashboard.hideLoadingMsg();
});
@ -105,7 +105,7 @@
vibrant: supportsImageAnalysis
});
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
});
@ -157,7 +157,7 @@
vibrant: supportsImageAnalysis
});
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
});
@ -205,14 +205,12 @@
vibrant: supportsImageAnalysis
});
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
});
}
function loadSuggestionsTab(page, tabContent) {
var parentId = LibraryMenu.getTopParentId();
function loadSuggestionsTab(page, tabContent, parentId) {
console.log('loadSuggestionsTab');
loadLatest(tabContent, parentId);
@ -227,31 +225,6 @@
});
}
pageIdOn('pagebeforeshow', "musicRecommendedPage", function () {
var page = this;
if (!page.getAttribute('data-title')) {
var parentId = LibraryMenu.getTopParentId();
if (parentId) {
ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).then(function (item) {
page.setAttribute('data-title', item.Name);
LibraryMenu.setTitle(item.Name);
});
} else {
page.setAttribute('data-title', Globalize.translate('TabMusic'));
LibraryMenu.setTitle(Globalize.translate('TabMusic'));
}
}
});
return function (view, params) {
var self = this;
@ -261,7 +234,7 @@
Dashboard.showLoadingMsg();
var tabContent = view.querySelector('.pageTabContent[data-index=\'' + 0 + '\']');
loadSuggestionsTab(view, tabContent);
loadSuggestionsTab(view, tabContent, params.topParentId);
}
function enableScrollX() {
@ -381,6 +354,28 @@
loadTab(view, parseInt(e.detail.selectedTabIndex));
});
view.addEventListener('viewbeforeshow', function (e) {
if (!view.getAttribute('data-title')) {
var parentId = params.topParentId;
if (parentId) {
ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).then(function (item) {
view.setAttribute('data-title', item.Name);
libraryMenu.setTitle(item.Name);
});
} else {
view.setAttribute('data-title', Globalize.translate('TabMusic'));
libraryMenu.setTitle(Globalize.translate('TabMusic'));
}
}
});
require(["headroom-window"], function (headroom) {
headroom.add(viewTabs);
self.headroom = headroom;

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

@ -1,4 +1,4 @@
define(['datetime', 'userdataButtons', 'itemHelper', 'events', 'browser', 'paper-icon-button-light'], function (datetime, userdataButtons, itemHelper, events, browser) {
define(['datetime', 'userdataButtons', 'itemHelper', 'events', 'browser', 'imageLoader', 'paper-icon-button-light'], function (datetime, userdataButtons, itemHelper, events, browser, imageLoader) {
'use strict';
var currentPlayer;
@ -593,7 +593,7 @@
currentImgUrl = url;
ImageLoader.lazyImage(nowPlayingImageElement, url);
imageLoader.lazyImage(nowPlayingImageElement, url);
if (nowPlayingItem.Id) {
ApiClient.getItem(Dashboard.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {

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

@ -1,4 +1,4 @@
define(['jQuery', 'cardBuilder', 'emby-itemscontainer'], function ($, cardBuilder) {
define(['jQuery', 'cardBuilder', 'imageLoader', 'emby-itemscontainer'], function ($, cardBuilder, imageLoader) {
'use strict';
var view = 'Poster';
@ -73,7 +73,7 @@
var elem = page.querySelector('.itemsContainer');
elem.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
$('.btnNextPage', page).on('click', function () {
query.StartIndex += query.Limit;

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

@ -1,4 +1,4 @@
define(['jQuery', 'listView'], function ($, listView) {
define(['jQuery', 'listView', 'imageLoader'], function ($, listView, imageLoader) {
'use strict';
var data = {};
@ -74,7 +74,7 @@
elem.classList.remove('vertical-wrap');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
$('.btnNextPage', elem).on('click', function () {
query.StartIndex += query.Limit;

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

@ -1,4 +1,4 @@
define(['listView', 'cardBuilder', 'libraryBrowser', 'apphost', 'emby-itemscontainer'], function (listView, cardBuilder, libraryBrowser, appHost) {
define(['listView', 'cardBuilder', 'libraryBrowser', 'apphost', 'imageLoader', 'emby-itemscontainer'], function (listView, cardBuilder, libraryBrowser, appHost, imageLoader) {
'use strict';
return function (view, params) {
@ -168,7 +168,7 @@
var elem = view.querySelector('.itemsContainer');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
var btnNextPage = view.querySelector('.btnNextPage');
if (btnNextPage) {

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'focusManager', 'embyRouter', 'cardBuilder', 'emby-input', 'paper-icon-button-light', 'material-icons', 'emby-itemscontainer'], function (libraryBrowser, focusManager, embyRouter, cardBuilder) {
define(['libraryBrowser', 'focusManager', 'embyRouter', 'cardBuilder', 'imageLoader', 'emby-input', 'paper-icon-button-light', 'material-icons', 'emby-itemscontainer'], function (libraryBrowser, focusManager, embyRouter, cardBuilder, imageLoader) {
'use strict';
function loadSuggestions(page) {
@ -131,7 +131,7 @@
itemsContainer.innerHTML = html;
searchResults.classList.remove('hide');
textSuggestions.classList.add('hide');
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
}
function requestSearchHintsForOverlay(searchTerm) {

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'listView', 'cardBuilder', 'emby-itemscontainer'], function (libraryBrowser, listView, cardBuilder) {
define(['libraryBrowser', 'listView', 'cardBuilder', 'imageLoader', 'emby-itemscontainer'], function (libraryBrowser, listView, cardBuilder, imageLoader) {
'use strict';
return function (view, params) {
@ -186,7 +186,7 @@
}
itemsContainer.innerHTML = html + pagingHtml;
ImageLoader.lazyChildren(itemsContainer);
imageLoader.lazyChildren(itemsContainer);
var i, length;
var elems;

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

@ -1,4 +1,4 @@
define(['libraryBrowser', 'cardBuilder', 'appSettings', 'components/groupedcards', 'dom', 'apphost', 'scrollStyles', 'emby-button', 'paper-icon-button-light', 'emby-itemscontainer'], function (libraryBrowser, cardBuilder, appSettings, groupedcards, dom, appHost) {
define(['libraryBrowser', 'cardBuilder', 'appSettings', 'components/groupedcards', 'dom', 'apphost', 'imageLoader', 'scrollStyles', 'emby-button', 'paper-icon-button-light', 'emby-itemscontainer'], function (libraryBrowser, cardBuilder, appSettings, groupedcards, dom, appHost, imageLoader) {
'use strict';
function getUserViews(userId) {
@ -320,7 +320,7 @@
}
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}
@ -392,7 +392,7 @@
}
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}
@ -447,7 +447,7 @@
return getAppInfo().then(function (infoHtml) {
elem.innerHTML = html + infoHtml;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
});
}
@ -522,7 +522,7 @@
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}
@ -571,7 +571,7 @@
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}
@ -649,7 +649,7 @@
var elem = page.querySelector('#channel' + channel.Id + '');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}
@ -703,7 +703,7 @@
html += '</div>';
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
});
}

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

@ -1,4 +1,4 @@
define(['jQuery', 'libraryBrowser'], function ($, libraryBrowser) {
define(['jQuery', 'libraryBrowser', 'imageLoader', 'indicators'], function ($, libraryBrowser, imageLoader, indicators) {
'use strict';
var currentItem;
@ -21,7 +21,7 @@
libraryBrowser.renderName(item, $('.itemName', page)[0], false);
libraryBrowser.renderParentName(item, $('.parentName', page)[0]);
libraryBrowser.renderDetailPageBackdrop(page, item);
libraryBrowser.renderDetailPageBackdrop(page, item, imageLoader);
renderImage(page, item);
@ -59,7 +59,7 @@
}
function renderImage(page, item) {
libraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, false);
libraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, false, null, imageLoader, indicators);
}
$(document).on('pageinit', "#publicSharedItemPage", function () {

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

@ -1235,6 +1235,8 @@ var AppInfo = {};
define("metadataEditor", [embyWebComponentsBowerPath + "/metadataeditor/metadataeditor"], returnFirstDependency);
define("personEditor", [embyWebComponentsBowerPath + "/metadataeditor/personeditor"], returnFirstDependency);
define("libraryMenu", ["scripts/librarymenu"], returnFirstDependency);
define("emby-collapse", [embyWebComponentsBowerPath + "/emby-collapse/emby-collapse"], returnFirstDependency);
define("emby-button", [embyWebComponentsBowerPath + "/emby-button/emby-button"], returnFirstDependency);
define("emby-itemscontainer", [embyWebComponentsBowerPath + "/emby-itemscontainer/emby-itemscontainer"], returnFirstDependency);
@ -2652,7 +2654,6 @@ var AppInfo = {};
var deps = [];
deps.push('imageLoader');
deps.push('embyRouter');
if (!(AppInfo.isNativeApp && browserInfo.android)) {
@ -2676,16 +2677,14 @@ var AppInfo = {};
}
}
deps.push('scripts/librarymenu');
deps.push('libraryMenu');
console.log('onAppReady - loading dependencies');
require(deps, function (imageLoader, pageObjects) {
require(deps, function (pageObjects) {
console.log('Loaded dependencies in onAppReady');
window.ImageLoader = imageLoader;
window.Emby = {};
window.Emby.Page = pageObjects;
defineCoreRoutes();

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

@ -1,4 +1,4 @@
define(['datetime', 'dom', 'listViewStyle', 'paper-icon-button-light', 'emby-button'], function (datetime, dom) {
define(['datetime', 'dom', 'imageLoader', 'listViewStyle', 'paper-icon-button-light', 'emby-button'], function (datetime, dom, imageLoader) {
'use strict';
function renderJob(page, job, dialogOptions) {
@ -119,7 +119,7 @@
var elem = page.querySelector('.jobItems');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
}
function parentWithClass(elem, className) {

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

@ -1,4 +1,4 @@
define(['components/categorysyncbuttons', 'components/groupedcards', 'cardBuilder', 'apphost'], function (categorysyncbuttons, groupedcards, cardBuilder, appHost) {
define(['components/categorysyncbuttons', 'components/groupedcards', 'cardBuilder', 'apphost', 'imageLoader'], function (categorysyncbuttons, groupedcards, cardBuilder, appHost, imageLoader) {
'use strict';
function getView() {
@ -56,7 +56,7 @@
var elem = context.querySelector('#latestEpisodes');
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
Dashboard.hideLoadingMsg();
});

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

@ -1,4 +1,4 @@
define(['datetime', 'libraryBrowser', 'cardBuilder', 'apphost', 'scrollStyles', 'emby-itemscontainer'], function (datetime, libraryBrowser, cardBuilder, appHost) {
define(['datetime', 'libraryBrowser', 'cardBuilder', 'apphost', 'imageLoader', 'scrollStyles', 'emby-itemscontainer'], function (datetime, libraryBrowser, cardBuilder, appHost, imageLoader) {
'use strict';
function getUpcomingPromise(context, params) {
@ -134,7 +134,7 @@
}
elem.innerHTML = html;
ImageLoader.lazyChildren(elem);
imageLoader.lazyChildren(elem);
}
return function (view, params, tabContent) {