diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js index 827048ae1b..8bf7feb682 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/router.js +++ b/dashboard-ui/bower_components/emby-webcomponents/router.js @@ -472,6 +472,10 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b } function show(path, options) { + if (path.indexOf('/') !== 0 && path.indexOf('://') === -1) { + path = '/' + path; + } + var baseRoute = baseUrl(); path = path.replace(baseRoute, ''); diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index aae81c8f65..c5d0494021 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -926,7 +926,7 @@ } function enableScrollX() { - return browserInfo.mobile && AppInfo.enableAppLayouts && screen.availWidth <= 1000; + return browserInfo.mobile && screen.availWidth <= 1000; } function getPortraitShape(scrollX) { diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index dc8d76df00..0be24dfa73 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -56,7 +56,7 @@ } function enableScrollX() { - return browserInfo.mobile && AppInfo.enableAppLayouts; + return browserInfo.mobile; } function renderRecordings(elem, recordings, cardOptions) { diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index 20410cde8c..27986721cc 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -2,7 +2,7 @@ 'use strict'; function enableScrollX() { - return browserInfo.mobile && AppInfo.enableAppLayouts; + return browserInfo.mobile; } function renderRecordings(elem, recordings, cardOptions) { diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index 9d45fed37e..ca7212f7bc 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -10,7 +10,7 @@ } function enableScrollX() { - return browserInfo.mobile && AppInfo.enableAppLayouts; + return browserInfo.mobile; } function getSquareShape() { @@ -168,10 +168,6 @@ infos.push(getTheaterInfo); } - if (!AppInfo.enableAppLayouts) { - infos.push(getUpgradeMobileLayoutsInfo); - } - return infos[getRandomInt(0, infos.length - 1)](); }); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index e5e57d9031..a9f55e4c98 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -162,11 +162,6 @@ var Dashboard = { url += queryString; } - if (url.indexOf('/') != 0) { - if (url.indexOf('://') == -1) { - url = '/' + url; - } - } return Emby.Page.show(url); }, @@ -656,7 +651,6 @@ var AppInfo = {}; AppInfo.enableHomeTabs = true; AppInfo.enableAutoSave = browserInfo.touch; - AppInfo.enableHashBang = Dashboard.isRunningInCordova(); AppInfo.enableAppStorePolicy = isCordova; @@ -669,7 +663,6 @@ var AppInfo = {}; } if (isCordova) { - AppInfo.enableAppLayouts = true; AppInfo.isNativeApp = true; AppInfo.enableHomeTabs = false; @@ -2498,7 +2491,7 @@ var AppInfo = {}; defineCoreRoutes(); Emby.Page.start({ click: true, - hashbang: AppInfo.enableHashBang + hashbang: Dashboard.isRunningInCordova() }); var postInitDependencies = []; @@ -2556,7 +2549,6 @@ var AppInfo = {}; } require(postInitDependencies); - upgradeLayouts(); initAutoSync(); }); } @@ -2583,16 +2575,6 @@ var AppInfo = {}; } } - function upgradeLayouts() { - if (!AppInfo.enableAppLayouts) { - Dashboard.getPluginSecurityInfo().then(function (info) { - if (info.IsMBSupporter) { - AppInfo.enableAppLayouts = true; - } - }); - } - } - function initAutoSync() { require(['serverNotifications', 'events'], function (serverNotifications, events) { events.on(serverNotifications, 'SyncJobItemReady', function (e, apiClient, data) { diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index 9215e16dac..a97d0ad1a6 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -56,7 +56,7 @@ } function enableScrollX() { - return browserInfo.mobile && AppInfo.enableAppLayouts; + return browserInfo.mobile; } function getThumbShape() {