';
+ var html = '
';
html += options.view;
html += '
';
return html;
@@ -158,7 +164,7 @@ define(['browser'], function (browser) {
var elem = parseHtml(options.view, hasScript);
elem.classList.add('page-view');
elem.setAttribute('data-type', options.type || '');
- elem.setAttribute('data-url', options.url);
+
return {
elem: elem,
hasScript: hasScript
@@ -247,7 +253,7 @@ define(['browser'], function (browser) {
function fade(newAnimatedPage, oldAnimatedPage, transition, isBack) {
var timings = {
- duration: animationDuration,
+ duration: 140,
iterations: 1,
easing: 'ease-out',
fill: 'both'
@@ -303,16 +309,6 @@ define(['browser'], function (browser) {
onBeforeChange = fn;
}
- function sendResolve(resolve, view) {
-
- // Don't report completion until the animation has finished, otherwise rendering may not perform well
- setTimeout(function () {
-
- resolve(view);
-
- }, animationDuration);
- }
-
function getSelectedIndex(allPages) {
return selectedPageIndex;
@@ -321,21 +317,13 @@ define(['browser'], function (browser) {
function tryRestoreView(options) {
var url = options.url;
- var view = document.querySelector(".page-view[data-url='" + url + "']");
- var page = parentWithClass(view, 'mainAnimatedPage');
+ var index = currentUrls.indexOf(url);
- if (view) {
+ if (index != -1) {
+ var page = allPages[index];
+ var view = page.querySelector(".page-view");
- var index = -1;
- var pages = allPages;
- for (var i = 0, length = pages.length; i < length; i++) {
- if (pages[i] == page) {
- index = i;
- break;
- }
- }
-
- if (index != -1) {
+ if (view) {
if (options.cancel) {
return;
@@ -360,6 +348,11 @@ define(['browser'], function (browser) {
afterAnimate(allPages, index);
}
+ // Temporary hack
+ // If a view renders UI in viewbeforeshow the lazy image loader will think the images aren't visible and won't load images
+ // The views need to be updated to start loading data in beforeshow, but not render until show
+ document.dispatchEvent(new CustomEvent('scroll', {}));
+
$.mobile = $.mobile || {};
$.mobile.activePage = view;
@@ -377,41 +370,17 @@ define(['browser'], function (browser) {
function reset() {
- var views = document.querySelectorAll(".mainAnimatedPage.hide .page-view");
-
- for (var i = 0, length = views.length; i < length; i++) {
-
- var view = views[i];
- triggerDestroy(view);
- view.parentNode.removeChild(view);
- }
+ currentUrls = [];
}
- function parentWithClass(elem, className) {
-
- while (!elem.classList || !elem.classList.contains(className)) {
- elem = elem.parentNode;
-
- if (!elem) {
- return null;
- }
- }
-
- return elem;
- }
-
- function init(isAnimationAllowed) {
-
- if (allowAnimation && enableAnimation() && !browser.animate) {
- require(['webAnimations']);
- }
+ if (enableAnimation() && !browser.animate) {
+ require(['webAnimations']);
}
return {
loadView: loadView,
tryRestoreView: tryRestoreView,
reset: reset,
- setOnBeforeChange: setOnBeforeChange,
- init: init
+ setOnBeforeChange: setOnBeforeChange
};
});
\ No newline at end of file
diff --git a/dashboard-ui/devices/android/android.css b/dashboard-ui/devices/android/android.css
index e10e5c746a..39324cfaa4 100644
--- a/dashboard-ui/devices/android/android.css
+++ b/dashboard-ui/devices/android/android.css
@@ -10,9 +10,9 @@
font-weight: bold !important;
}
-/*.libraryViewNav {
+.libraryViewNav {
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2);
-}*/
+}
@media all and (min-width: 300px) {
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js
index 124616ee80..8ecf9cf1b9 100644
--- a/dashboard-ui/scripts/channels.js
+++ b/dashboard-ui/scripts/channels.js
@@ -76,7 +76,7 @@
var mdlTabs = page.querySelector('.libraryViewNav');
- libraryBrowser.configurePaperLibraryTabs(page, mdlTabs, page.querySelectorAll('.pageTabContent'), true);
+ libraryBrowser.configurePaperLibraryTabs(page, mdlTabs, page.querySelectorAll('.pageTabContent'), [0, 1]);
mdlTabs.addEventListener('tabchange', function (e) {
loadTab(page, parseInt(e.detail.selectedTabIndex));
diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js
index ae7a38e4e6..6a6efcd7ff 100644
--- a/dashboard-ui/scripts/homenextup.js
+++ b/dashboard-ui/scripts/homenextup.js
@@ -9,13 +9,9 @@
function loadNextUp(page) {
- var limit = AppInfo.hasLowImageBandwidth ?
- 16 :
- 24;
-
var query = {
- Limit: limit,
+ Limit: 24,
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js
index 54a7beed86..3be899f292 100644
--- a/dashboard-ui/scripts/homeupcoming.js
+++ b/dashboard-ui/scripts/homeupcoming.js
@@ -3,13 +3,9 @@
function loadUpcoming(page) {
Dashboard.showLoadingMsg();
- var limit = AppInfo.hasLowImageBandwidth && !enableScrollX() ?
- 24 :
- 40;
-
var query = {
- Limit: limit,
+ Limit: 40,
Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 1342d0c41b..6650571a89 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -249,7 +249,7 @@
var mdlTabs = view.querySelector('.libraryViewNav');
- libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), true);
+ libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0,1,2,3]);
var tabControllers = [];
var renderedTabs = [];
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 18db76b4ee..f7bdfeb3e1 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -63,6 +63,8 @@
Dashboard.getCurrentUser().then(function (user) {
+ window.scrollTo(0, 0);
+
renderImage(page, item, user);
setInitialCollapsibleState(page, item, context, user);
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 31a0453282..0e01a04fc1 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -13,6 +13,21 @@
return elem;
}
+ function fadeInRight(elem) {
+
+ var pct = browserInfo.mobile ? '2%' : '1%';
+
+ var keyframes = [
+ { opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
+ { opacity: '1', transform: 'none', offset: 1 }];
+
+ elem.animate(keyframes, {
+ duration: 300,
+ iterations: 1,
+ easing: 'ease-out'
+ });
+ }
+
var libraryBrowser = (function (window, document, screen) {
// Regular Expressions for parsing tags and attributes
@@ -225,7 +240,7 @@
});
},
- configurePaperLibraryTabs: function (ownerpage, tabs, panels, animate) {
+ configurePaperLibraryTabs: function (ownerpage, tabs, panels, animateTabs) {
if (!browserInfo.safari) {
LibraryBrowser.configureSwipeTabs(ownerpage, tabs);
@@ -241,21 +256,6 @@
tabs.classList.add('hiddenScrollX');
- function fadeInRight(elem) {
-
- var pct = browserInfo.mobile ? '1.5%' : '0.5%';
-
- var keyframes = [
- { opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
- { opacity: '1', transform: 'none', offset: 1 }];
-
- elem.animate(keyframes, {
- duration: 300,
- iterations: 1,
- easing: 'ease-out'
- });
- }
-
tabs.addEventListener('click', function (e) {
var current = tabs.querySelector('.is-active');
@@ -267,24 +267,28 @@
current.classList.remove('is-active');
panels[parseInt(current.getAttribute('data-index'))].classList.remove('is-active');
}
+
link.classList.add('is-active');
var index = parseInt(link.getAttribute('data-index'));
- tabs.dispatchEvent(new CustomEvent("tabchange", {
- detail: {
- selectedTabIndex: index
- }
- }));
+ var newPanel = panels[index];
- panels[index].classList.add('is-active');
-
- if (browserInfo.animate && animate) {
- fadeInRight(panels[index]);
+ if (animateTabs && animateTabs.indexOf(index) != -1 && /*browserInfo.animate &&*/ newPanel.animate) {
+ fadeInRight(newPanel);
}
// If toCenter is called syncronously within the click event, it sometimes ends up canceling it
- //setTimeout(function() {
- // scrollHelper.toCenter(tabs, link, true);
- //}, 10);
+ setTimeout(function () {
+
+ tabs.dispatchEvent(new CustomEvent("tabchange", {
+ detail: {
+ selectedTabIndex: index
+ }
+ }));
+
+ newPanel.classList.add('is-active');
+
+ //scrollHelper.toCenter(tabs, link, true);
+ }, 100);
}
});
@@ -1722,7 +1726,7 @@
if (AppInfo.hasLowImageBandwidth) {
if (!AppInfo.isNativeApp) {
- screenWidth *= .7;
+ screenWidth *= .75;
}
} else {
screenWidth *= 1.2;
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 36fcfd99c2..c5323c1f6e 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -737,12 +737,14 @@
var html = title;
- var page = $.mobile.activePage;
- if (page) {
- var helpUrl = page.getAttribute('data-helpurl');
+ if (window.$ && $.mobile) {
+ var page = $.mobile.activePage;
+ if (page) {
+ var helpUrl = page.getAttribute('data-helpurl');
- if (helpUrl) {
- html += '
Help';
+ if (helpUrl) {
+ html += '
Help';
+ }
}
}
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 029afaf1bf..1850900114 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -204,7 +204,7 @@
baseUrl += '?topParentId=' + topParentId;
}
- libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), true);
+ libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 2, 3, 4]);
mdlTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex));
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 086f143fed..203212b03b 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -303,7 +303,7 @@
baseUrl += '?topParentId=' + topParentId;
}
- libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'));
+ libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 4, 5]);
var tabControllers = [];
var renderedTabs = [];
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 5d5731bfb9..4c6b34d085 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -331,7 +331,7 @@
baseUrl += '?topParentId=' + topParentId;
}
- libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'));
+ libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 4, 5, 6]);
mdlTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex));
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index cb5018ff46..66bed4a61c 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -246,13 +246,9 @@
function loadRecentlyAdded(elem, user) {
- var limit = AppInfo.hasLowImageBandwidth ?
- 16 :
- 20;
-
var options = {
- Limit: limit,
+ Limit: 20,
Fields: "PrimaryImageAspectRatio,SyncInfo",
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Thumb"
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 17bbe19a05..f267cae112 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1183,11 +1183,6 @@ var Dashboard = {
options.enableImageEnhancers = false;
}
-
- if (AppInfo.forcedImageFormat && options.type != 'Logo') {
- options.format = AppInfo.forcedImageFormat;
- options.backgroundColor = '#1c1c1c';
- }
},
loadExternalPlayer: function () {
@@ -1472,8 +1467,6 @@ var AppInfo = {};
AppInfo.enableDetailPageChapters = false;
AppInfo.enableDetailsMenuImages = false;
AppInfo.enableMovieHomeSuggestions = false;
-
- AppInfo.forcedImageFormat = 'jpg';
}
}
@@ -1642,39 +1635,6 @@ var AppInfo = {};
});
}
- function initFastClick() {
-
- require(["fastclick"], function (FastClick) {
-
- FastClick.attach(document.body, {
- tapDelay: 0
- });
-
- function parentWithClass(elem, className) {
-
- while (!elem.classList || !elem.classList.contains(className)) {
- elem = elem.parentNode;
-
- if (!elem) {
- return null;
- }
- }
-
- return elem;
- }
-
- // Have to work around this issue of fast click breaking the panel dismiss
- document.body.addEventListener('touchstart', function (e) {
-
- var tgt = parentWithClass(e.target, 'ui-panel-dismiss');
- if (tgt) {
- $(tgt).click();
- }
- });
- });
-
- }
-
function setDocumentClasses(browser) {
var elem = document.documentElement;
@@ -1792,7 +1752,8 @@ var AppInfo = {};
globalize: embyWebComponentsBowerPath + "/globalize",
itemHelper: embyWebComponentsBowerPath + '/itemhelper',
itemShortcuts: embyWebComponentsBowerPath + "/shortcuts",
- imageLoader: embyWebComponentsBowerPath + "/images/imagehelper"
+ imageLoader: embyWebComponentsBowerPath + "/images/imagehelper",
+ webAnimations: bowerPath + '/web-animations-js/web-animations-next-lite.min'
};
if (navigator.webkitPersistentStorage) {
@@ -2388,13 +2349,15 @@ var AppInfo = {};
defineRoute({
path: '/channelitems.html',
dependencies: [],
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
path: '/channels.html',
dependencies: [],
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
@@ -2562,7 +2525,8 @@ var AppInfo = {};
path: '/home.html',
dependencies: [],
autoFocus: false,
- controller: 'scripts/indexpage'
+ controller: 'scripts/indexpage',
+ transition: 'fade'
});
defineRoute({
@@ -2575,14 +2539,16 @@ var AppInfo = {};
defineRoute({
path: '/itemdetails.html',
dependencies: ['paper-button'],
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
path: '/itemlist.html',
dependencies: ['paper-checkbox', 'scripts/alphapicker'],
autoFocus: false,
- controller: 'scripts/itemlistpage'
+ controller: 'scripts/itemlistpage',
+ transition: 'fade'
});
defineRoute({
@@ -2616,7 +2582,8 @@ var AppInfo = {};
path: '/livetv.html',
dependencies: ['paper-button', 'livetvcss'],
controller: 'scripts/livetvsuggested',
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
@@ -2732,14 +2699,16 @@ var AppInfo = {};
path: '/movies.html',
dependencies: ['paper-checkbox', 'paper-fab', 'scripts/alphapicker', 'paper-button'],
autoFocus: false,
- controller: 'scripts/moviesrecommended'
+ controller: 'scripts/moviesrecommended',
+ transition: 'fade'
});
defineRoute({
path: '/music.html',
dependencies: ['scripts/alphapicker'],
controller: 'scripts/musicrecommended',
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
@@ -2821,7 +2790,8 @@ var AppInfo = {};
defineRoute({
path: '/photos.html',
dependencies: [],
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
@@ -2834,7 +2804,8 @@ var AppInfo = {};
defineRoute({
path: '/playlists.html',
dependencies: [],
- autoFocus: false
+ autoFocus: false,
+ transition: 'fade'
});
defineRoute({
@@ -2948,7 +2919,8 @@ var AppInfo = {};
path: '/tv.html',
dependencies: ['paper-checkbox', 'paper-icon-button-light', 'paper-button'],
autoFocus: false,
- controller: 'scripts/tvrecommended'
+ controller: 'scripts/tvrecommended',
+ transition: 'fade'
});
defineRoute({
@@ -3282,6 +3254,7 @@ pageClassOn('viewinit', "page", function () {
page.classList.add("ui-page");
page.classList.add("ui-page-theme-" + current);
+ page.classList.add("ui-body-" + current);
var contents = page.querySelectorAll("div[data-role='content']");
@@ -3309,13 +3282,9 @@ pageClassOn('viewshow', "page", function () {
if (currentTheme == 'a') {
docElem.classList.add('background-theme-a');
docElem.classList.remove('background-theme-b');
- page.classList.add('ui-body-a');
- page.classList.remove('ui-body-b');
} else {
docElem.classList.add('background-theme-b');
docElem.classList.remove('background-theme-a');
- page.classList.add('ui-body-b');
- page.classList.remove('ui-body-a');
}
var apiClient = window.ApiClient;
diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js
index 0d5c0357f9..3d958ca089 100644
--- a/dashboard-ui/scripts/tvlatest.js
+++ b/dashboard-ui/scripts/tvlatest.js
@@ -13,16 +13,10 @@
var parentId = params.topParentId;
- var limit = 30;
-
- if (AppInfo.hasLowImageBandwidth) {
- limit = 16;
- }
-
var options = {
IncludeItemTypes: "Episode",
- Limit: limit,
+ Limit: 30,
Fields: "PrimaryImageAspectRatio,SyncInfo",
ParentId: parentId,
ImageTypeLimit: 1,
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 50faf2b823..9aefac9646 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -24,13 +24,9 @@
function loadNextUp() {
- var limit = AppInfo.hasLowImageBandwidth ?
- 16 :
- 24;
-
var query = {
- Limit: limit,
+ Limit: 24,
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,
@@ -258,7 +254,7 @@
view.querySelector('#resumableItems').classList.remove('hiddenScrollX');
}
libraryBrowser.createCardMenus(view.querySelector('#resumableItems'));
- libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'));
+ libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 1, 2, 4, 5, 6]);
mdlTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex));
diff --git a/dashboard-ui/scripts/tvupcoming.js b/dashboard-ui/scripts/tvupcoming.js
index 27142bf92d..95c21592d1 100644
--- a/dashboard-ui/scripts/tvupcoming.js
+++ b/dashboard-ui/scripts/tvupcoming.js
@@ -4,13 +4,9 @@
Dashboard.showLoadingMsg();
- var limit = AppInfo.hasLowImageBandwidth && !enableScrollX() ?
- 24 :
- 40;
-
var query = {
- Limit: limit,
+ Limit: 40,
Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1,