1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fix remote control nav

This commit is contained in:
Luke Pulverenti 2017-01-26 13:51:14 -05:00
parent 48c0634cc6
commit c86f9cadc4
7 changed files with 10 additions and 28 deletions

View file

@ -472,6 +472,10 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
} }
function show(path, options) { function show(path, options) {
if (path.indexOf('/') !== 0 && path.indexOf('://') === -1) {
path = '/' + path;
}
var baseRoute = baseUrl(); var baseRoute = baseUrl();
path = path.replace(baseRoute, ''); path = path.replace(baseRoute, '');

View file

@ -926,7 +926,7 @@
} }
function enableScrollX() { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts && screen.availWidth <= 1000; return browserInfo.mobile && screen.availWidth <= 1000;
} }
function getPortraitShape(scrollX) { function getPortraitShape(scrollX) {

View file

@ -56,7 +56,7 @@
} }
function enableScrollX() { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts; return browserInfo.mobile;
} }
function renderRecordings(elem, recordings, cardOptions) { function renderRecordings(elem, recordings, cardOptions) {

View file

@ -2,7 +2,7 @@
'use strict'; 'use strict';
function enableScrollX() { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts; return browserInfo.mobile;
} }
function renderRecordings(elem, recordings, cardOptions) { function renderRecordings(elem, recordings, cardOptions) {

View file

@ -10,7 +10,7 @@
} }
function enableScrollX() { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts; return browserInfo.mobile;
} }
function getSquareShape() { function getSquareShape() {
@ -168,10 +168,6 @@
infos.push(getTheaterInfo); infos.push(getTheaterInfo);
} }
if (!AppInfo.enableAppLayouts) {
infos.push(getUpgradeMobileLayoutsInfo);
}
return infos[getRandomInt(0, infos.length - 1)](); return infos[getRandomInt(0, infos.length - 1)]();
}); });
} }

View file

@ -162,11 +162,6 @@ var Dashboard = {
url += queryString; url += queryString;
} }
if (url.indexOf('/') != 0) {
if (url.indexOf('://') == -1) {
url = '/' + url;
}
}
return Emby.Page.show(url); return Emby.Page.show(url);
}, },
@ -656,7 +651,6 @@ var AppInfo = {};
AppInfo.enableHomeTabs = true; AppInfo.enableHomeTabs = true;
AppInfo.enableAutoSave = browserInfo.touch; AppInfo.enableAutoSave = browserInfo.touch;
AppInfo.enableHashBang = Dashboard.isRunningInCordova();
AppInfo.enableAppStorePolicy = isCordova; AppInfo.enableAppStorePolicy = isCordova;
@ -669,7 +663,6 @@ var AppInfo = {};
} }
if (isCordova) { if (isCordova) {
AppInfo.enableAppLayouts = true;
AppInfo.isNativeApp = true; AppInfo.isNativeApp = true;
AppInfo.enableHomeTabs = false; AppInfo.enableHomeTabs = false;
@ -2498,7 +2491,7 @@ var AppInfo = {};
defineCoreRoutes(); defineCoreRoutes();
Emby.Page.start({ Emby.Page.start({
click: true, click: true,
hashbang: AppInfo.enableHashBang hashbang: Dashboard.isRunningInCordova()
}); });
var postInitDependencies = []; var postInitDependencies = [];
@ -2556,7 +2549,6 @@ var AppInfo = {};
} }
require(postInitDependencies); require(postInitDependencies);
upgradeLayouts();
initAutoSync(); 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() { function initAutoSync() {
require(['serverNotifications', 'events'], function (serverNotifications, events) { require(['serverNotifications', 'events'], function (serverNotifications, events) {
events.on(serverNotifications, 'SyncJobItemReady', function (e, apiClient, data) { events.on(serverNotifications, 'SyncJobItemReady', function (e, apiClient, data) {

View file

@ -56,7 +56,7 @@
} }
function enableScrollX() { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts; return browserInfo.mobile;
} }
function getThumbShape() { function getThumbShape() {