milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into servernotifications-fixes

Browse source
This commit is contained in:
ferferga 2020-02-28 10:07:10 +01:00
commit 04a3505672
340 changed files with 3843 additions and 2552 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/scripts/apploader.js
View file

@ -19,11 +19,23 @@
document.head.appendChild(script);
}
injectScriptElement(
self.Promise ? "./libraries/alameda.js" : "./libraries/require.js",
function() {
// onload of require library
injectScriptElement("./scripts/site.js");
}
);
function loadSite() {
injectScriptElement(
"./libraries/alameda.js",
function() {
// onload of require library
injectScriptElement("./scripts/site.js");
}
);
}
if (!self.Promise) {
// Load Promise polyfill if they are not natively supported
injectScriptElement(
"./libraries/npo.js",
loadSite
);
} else {
loadSite();
}
})();

2
src/scripts/autobackdrops.js
View file

@ -10,7 +10,7 @@ define(["backdrop", "userSettings", "libraryMenu"], function (backdrop, userSett
var data = cache[key];
if (data) {
console.log("Found backdrop id list in cache. Key: " + key);
console.debug("Found backdrop id list in cache. Key: " + key);
data = JSON.parse(data);
return Promise.resolve(data);
}

2
src/scripts/browser.js
View file

@ -311,4 +311,4 @@ define([], function () {
browser.chromecast = browser.chrome && userAgent.toLowerCase().indexOf('crkey') !== -1;
return browser;
});
});

8
src/scripts/browserdeviceprofile.js
View file

@ -92,7 +92,7 @@ define(['browser'], function (browser) {
return true;
}
if (!!videoTestElement.canPlayType) {
if (videoTestElement.canPlayType) {
return videoTestElement.canPlayType('application/x-mpegurl; codecs="avc1.42E01E, ac-3"').replace(/no/, '') ||
videoTestElement.canPlayType('application/vnd.apple.mpegURL; codecs="avc1.42E01E, ac-3"').replace(/no/, '');
}
@ -302,9 +302,9 @@ define(['browser'], function (browser) {
try {
var isTizenUhd = webapis.productinfo.isUdPanelSupported();
isTizenFhd = !isTizenUhd;
console.log("isTizenFhd = " + isTizenFhd);
console.debug("isTizenFhd = " + isTizenFhd);
} catch (error) {
console.log("isUdPanelSupported() error code = " + error.code);
console.error("isUdPanelSupported() error code = " + error.code);
}
}
@ -761,7 +761,7 @@ define(['browser'], function (browser) {
videoTestElement.canPlayType('video/mp4; codecs="avc1.6e0033"').replace(/no/, '')) {
// These tests are passing in safari, but playback is failing
if (!browser.safari && !browser.iOS && !browser.web0s && !browser.edge) {
if (!browser.safari && !browser.iOS && !browser.web0s && !browser.edge && !browser.mobile) {
h264Profiles += '|high 10';
}
}

2
src/scripts/datetime.js
View file

@ -279,4 +279,4 @@ define(['globalize'], function (globalize) {
return toLocaleTimeStringSupportsLocales;
}
};
});
});

2
src/scripts/editorsidebar.js
View file

@ -49,7 +49,7 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
} else if (item.MediaType === "Audio") {
htmlName += '<i class="material-icons metadataSidebarIcon">audiotrack</i>';
} else if (item.Type === "TvChannel") {
htmlName += '<i class="material-icons metadataSidebarIcon">live_tv</i>';
htmlName += '<i class="material-icons metadataSidebarIcon live_tv"></i>';
} else if (item.MediaType === "Photo") {
htmlName += '<i class="material-icons metadataSidebarIcon">photo</i>';
} else if (item.MediaType === "Book") {

4
src/scripts/globalize.js
View file

@ -38,7 +38,7 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
try {
culture = userSettings.language();
} catch (err) {
console.log('no language set in user settings');
console.error('no language set in user settings');
}
culture = culture || getDefaultLanguage();
@ -48,7 +48,7 @@ define(['connectionManager', 'userSettings', 'events'], function (connectionMana
try {
dateTimeCulture = userSettings.dateTimeLocale();
} catch (err) {
console.log('no date format set in user settings');
console.error('no date format set in user settings');
}
if (dateTimeCulture) {

11
src/scripts/imagehelper.js
View file

@ -3,7 +3,7 @@ define(["browser"], function (browser) {
function getDeviceIcon(device) {
var baseUrl = "assets/img/devices/";
switch (device.AppName) {
switch (device.AppName || device.Client) {
case "Samsung Smart TV":
return baseUrl + "samsung.svg";
case "Xbox One":
@ -15,14 +15,21 @@ define(["browser"], function (browser) {
case "Jellyfin Android":
return baseUrl + "android.svg";
case "Jellyfin Web":
switch (device.Name) {
switch (device.Name || device.DeviceName) {
case "Opera":
case "Opera TV":
case "Opera Android":
return baseUrl + "opera.svg";
case "Chrome":
case "Chrome Android":
return baseUrl + "chrome.svg";
case "Firefox":
case "Firefox Android":
return baseUrl + "firefox.svg";
case "Safari":
case "Safari iPad":
case "Safari iPhone":
return baseUrl + "safari.svg";
case "Edge":
return baseUrl + "edge.svg";
case "Internet Explorer":

8
src/scripts/inputManager.js
View file

@ -1,4 +1,4 @@
define(['playbackManager', 'focusManager', 'appRouter', 'dom'], function (playbackManager, focusManager, appRouter, dom) {
define(['playbackManager', 'focusManager', 'appRouter', 'dom', 'apphost'], function (playbackManager, focusManager, appRouter, dom, appHost) {
'use strict';
var lastInputTime = new Date().getTime();
@ -96,7 +96,11 @@ define(['playbackManager', 'focusManager', 'appRouter', 'dom'], function (playba
appRouter.showSettings();
break;
case 'back':
appRouter.back();
if (appRouter.canGoBack()) {
appRouter.back();
} else if (appHost.supports('exit')) {
appHost.exit();
}
break;
case 'forward':
break;

16
src/scripts/itembynamedetailpage.js
View file

@ -99,7 +99,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10,
SortBy: "StartDate"
}, {
shape: "backdrop",
shape: "overflowBackdrop",
showTitle: true,
centerText: true,
overlayMoreButton: true,
@ -121,7 +121,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10,
SortBy: "SortName"
}, {
shape: "portrait",
shape: "overflowPortrait",
showTitle: true,
centerText: true,
overlayMoreButton: true,
@ -140,7 +140,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10,
SortBy: "SortName"
}, {
shape: "portrait",
shape: "overflowPortrait",
showTitle: true,
centerText: true,
overlayPlayButton: true
@ -157,7 +157,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10,
SortBy: "SortName"
}, {
shape: "portrait",
shape: "overflowPortrait",
showTitle: true,
centerText: true,
overlayPlayButton: true
@ -174,7 +174,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 10,
SortBy: "SortName"
}, {
shape: "portrait",
shape: "overflowPortrait",
showTitle: true,
centerText: true,
overlayMoreButton: true
@ -191,7 +191,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
SortOrder: "Descending",
SortBy: "ProductionYear,Sortname"
}, {
shape: "square",
shape: "overflowSquare",
playFromHere: true,
showTitle: true,
showYear: true,
@ -211,7 +211,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 8,
SortBy: "SortName"
}, {
shape: "square",
shape: "overflowSquare",
playFromHere: true,
showTitle: true,
showParentTitle: true,
@ -231,7 +231,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB
Limit: 6,
SortBy: "SortName"
}, {
shape: "backdrop",
shape: "overflowBackdrop",
showTitle: true,
showParentTitle: true,
centerText: true,

10
src/scripts/librarybrowser.js
View file

@ -91,20 +91,20 @@ define(["userSettings"], function (userSettings) {
html += '<div style="display:inline-block;">';
if (showControls) {
html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? "" : "disabled") + '><i class="material-icons">arrow_back</i></button>';
html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? "disabled" : "") + '><i class="material-icons">arrow_forward</i></button>';
html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? "" : "disabled") + '><i class="material-icons arrow_back"></i></button>';
html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? "disabled" : "") + '><i class="material-icons arrow_forward"></i></button>';
}
if (options.addLayoutButton) {
html += '<button is="paper-icon-button-light" title="' + Globalize.translate("ButtonSelectView") + '" class="btnChangeLayout autoSize" data-layouts="' + (options.layouts || "") + '" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || "") + '\');"><i class="material-icons">view_comfy</i></button>';
html += '<button is="paper-icon-button-light" title="' + Globalize.translate("ButtonSelectView") + '" class="btnChangeLayout autoSize" data-layouts="' + (options.layouts || "") + '" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || "") + '\');"><i class="material-icons view_comfy"></i></button>';
}
if (options.sortButton) {
html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + Globalize.translate("ButtonSort") + '"><i class="material-icons">sort_by_alpha</i></button>';
html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + Globalize.translate("ButtonSort") + '"><i class="material-icons sort_by_alpha"></i></button>';
}
if (options.filterButton) {
html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + Globalize.translate("ButtonFilter") + '"><i class="material-icons">filter_list</i></button>';
html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + Globalize.translate("ButtonFilter") + '"><i class="material-icons filter_list"></i></button>';
}
html += "</div>";

35
src/scripts/librarymenu.js
View file

@ -5,13 +5,14 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var html = "";
html += '<div class="flex align-items-center flex-grow headerTop">';
html += '<div class="headerLeft">';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide"><i class="material-icons">' + (browser.safari ? "chevron_left" : "arrow_back") + "</i></button>";
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide"><i class="material-icons ' + (browser.safari ? 'chevron_left' : 'arrow_back') + '"></i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerHomeButton hide barsMenuButton headerButtonLeft"><i class="material-icons">home</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><i class="material-icons">menu</i></button>';
html += '<h3 class="pageTitle"></h3>';
html += "</div>";
html += '<div class="headerRight">';
html += '<span class="headerSelectedPlayer"></span>';
html += '<button is="paper-icon-button-light" class="headerAudioPlayerButton audioPlayerButton headerButton headerButtonRight hide"><i class="material-icons music_note"></i></button>';
html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><i class="material-icons">cast</i></button>';
html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><i class="material-icons">search</i></button>';
html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><i class="material-icons">person</i></button>';
@ -27,6 +28,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
headerHomeButton = skinHeader.querySelector(".headerHomeButton");
headerUserButton = skinHeader.querySelector(".headerUserButton");
headerCastButton = skinHeader.querySelector(".headerCastButton");
headerAudioPlayerButton = skinHeader.querySelector(".headerAudioPlayerButton");
headerSearchButton = skinHeader.querySelector(".headerSearchButton");
lazyLoadViewMenuBarImages();
@ -116,6 +118,10 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
Dashboard.navigate("home.html");
}
function showAudioPlayer() {
return appRouter.showNowPlaying();
}
function bindMenuEvents() {
mainDrawerButton = document.querySelector(".mainDrawerButton");
@ -140,9 +146,27 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
headerCastButton.addEventListener("click", onCastButtonClicked);
}
headerAudioPlayerButton.addEventListener("click", showAudioPlayer);
if (layoutManager.mobile) {
initHeadRoom(skinHeader);
}
events.on(playbackManager, 'playbackstart', onPlaybackStart);
events.on(playbackManager, 'playbackstop', onPlaybackStop);
}
function onPlaybackStart(e) {
if (playbackManager.isPlayingAudio() && layoutManager.tv) {
headerAudioPlayerButton.classList.remove("hide");
} else {
headerAudioPlayerButton.classList.add("hide");
}
}
function onPlaybackStop(e, stopInfo) {
if (stopInfo.nextMediaType != 'Audio') {
headerAudioPlayerButton.classList.add("hide");
}
}
function onCastButtonClicked() {
@ -205,7 +229,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += globalize.translate("HeaderAdmin");
html += "</h3>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="dashboard.html"><i class="material-icons navMenuOptionIcon">dashboard</i><span class="navMenuOptionText">' + globalize.translate("TabDashboard") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html"><i class="material-icons navMenuOptionIcon">mode_edit</i><span class="navMenuOptionText">' + globalize.translate("Metadata") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="edititemmetadata.html"><i class="material-icons navMenuOptionIcon mode_edit"></i><span class="navMenuOptionText">' + globalize.translate("Metadata") + "</span></a>";
html += "</div>";
}
@ -219,7 +243,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="material-icons navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
}
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="material-icons navMenuOptionIcon">exit_to_app</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="material-icons navMenuOptionIcon exit_to_app"></i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
html += "</div>";
}
@ -306,7 +330,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
icon: "folder"
}, {
name: globalize.translate("TabPlayback"),
icon: "play_arrow",
icon: "&#xE037;",
href: "encodingsettings.html",
pageIds: ["encodingSettingsPage", "playbackConfigurationPage", "streamingSettingsPage"]
}];
@ -584,7 +608,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var icon = headerCastButton.querySelector("i");
if (info && !info.isLocalPlayer) {
icon.innerHTML = "cast_connected";
icon.innerHTML = "&#xE308;";
headerCastButton.classList.add("castButton-active");
context.querySelector(".headerSelectedPlayer").innerHTML = info.deviceName || info.name;
} else {
@ -763,6 +787,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var currentUser;
var headerCastButton;
var headerSearchButton;
var headerAudioPlayerButton;
var enableLibraryNavDrawer = !layoutManager.tv;
var skinHeader = document.querySelector(".skinHeader");
var requiresUserRefresh = true;

2
src/scripts/livetvcomponents.js
View file

@ -34,7 +34,7 @@ define(["layoutManager", "datetime", "cardBuilder", "apphost"], function (layout
day: "numeric"
});
} catch (err) {
console.log("Error parsing premiereDate:" + item.StartDate + "; error: " + err);
console.error("error parsing premiereDate:" + item.StartDate + "; error: " + err);
}
}

10
src/scripts/routes.js
View file

@ -16,12 +16,12 @@ define([
function defineRoute(newRoute) {
var path = newRoute.path;
console.log("defining route: " + path);
console.debug("defining route: " + path);
newRoute.dictionary = "core";
Emby.Page.addRoute(path, newRoute);
}
console.log("defining core routes");
console.debug("defining core routes");
defineRoute({
path: "/addplugin.html",
@ -226,7 +226,8 @@ define([
autoFocus: false,
anonymous: true,
startup: true,
controller: "auth/login"
controller: "auth/login",
type: "login"
});
defineRoute({
path: "/metadataimages.html",
@ -312,7 +313,8 @@ define([
autoFocus: false,
anonymous: true,
startup: true,
controller: "auth/selectserver"
controller: "auth/selectserver",
type: "selectserver"
});
defineRoute({
path: "/serveractivity.html",

9
src/scripts/settings/userSettings.js
View file

@ -120,6 +120,15 @@ define(['appSettings', 'events'], function (appSettings, events) {
return val !== 'false';
};
UserSettings.prototype.enableFastFadein = function (val) {
if (val != null) {
return this.set('fastFadein', val.toString(), false);
}
val = this.get('fastFadein', false);
return val !== 'false';
};
UserSettings.prototype.enableBackdrops = function (val) {
if (val != null) {
return this.set('enableBackdrops', val.toString(), false);

66
src/scripts/site.js
View file

@ -221,6 +221,13 @@ var Dashboard = {
};
appHost.getPushTokenInfo();
return capabilities = Object.assign(capabilities, appHost.getPushTokenInfo());
},
selectServer: function () {
if (window.NativeShell && typeof window.NativeShell.selectServer === "function") {
window.NativeShell.selectServer();
} else {
Dashboard.navigate("selectserver.html");
}
}
};
@ -279,10 +286,10 @@ var AppInfo = {};
bindConnectionManagerEvents(connectionManager, events, userSettings);
if (!AppInfo.isNativeApp) {
console.log("loading ApiClient singleton");
console.debug("loading ApiClient singleton");
return require(["apiclient"], function (apiClientFactory) {
console.log("creating ApiClient singleton");
console.debug("creating ApiClient singleton");
var apiClient = new apiClientFactory(Dashboard.serverAddress(), apphost.appName(), apphost.appVersion(), apphost.deviceName(), apphost.deviceId(), window.devicePixelRatio);
@ -294,7 +301,7 @@ var AppInfo = {};
window.ApiClient = apiClient;
localApiClient = apiClient;
console.log("loaded ApiClient singleton");
console.debug("loaded ApiClient singleton");
});
}
@ -328,7 +335,7 @@ var AppInfo = {};
try {
playbackManager.onAppClose();
} catch (err) {
console.log("error in onAppClose: " + err);
console.error("error in onAppClose: " + err);
}
});
return playbackManager;
@ -386,7 +393,7 @@ var AppInfo = {};
}
function onRequireJsError(requireType, requireModules) {
console.log("RequireJS error: " + (requireType || "unknown") + ". Failed modules: " + (requireModules || []).join(","));
console.error("RequireJS error: " + (requireType || "unknown") + ". Failed modules: " + (requireModules || []).join(","));
}
function defineResizeObserver() {
@ -474,7 +481,7 @@ var AppInfo = {};
Promise.all(promises).then(function () {
createConnectionManager().then(function () {
console.log("initAfterDependencies promises resolved");
console.debug("initAfterDependencies promises resolved");
require(["globalize", "browser"], function (globalize, browser) {
window.Globalize = globalize;
@ -518,10 +525,10 @@ var AppInfo = {};
document.title = Globalize.translateDocument(document.title, "core");
if (browser.tv && !browser.android) {
console.log("Using system fonts with explicit sizes");
console.debug("using system fonts with explicit sizes");
require(["systemFontsSizedCss"]);
} else {
console.log("Using default fonts");
console.debug("using default fonts");
require(["systemFontsCss"]);
}
@ -533,7 +540,7 @@ var AppInfo = {};
}
function loadPlugins(appHost, browser, shell) {
console.log("Loading installed plugins");
console.debug("loading installed plugins");
var list = [
"components/playback/playaccessvalidation",
"components/playback/experimentalwarnings",
@ -575,13 +582,13 @@ var AppInfo = {};
}
function onAppReady(browser) {
console.log("Begin onAppReady");
console.debug("begin onAppReady");
// ensure that appHost is loaded in this point
require(['apphost', 'appRouter'], function (appHost, appRouter) {
window.Emby = {};
console.log("onAppReady - loading dependencies");
console.debug("onAppReady: loading dependencies");
if (browser.iOS) {
require(['css!assets/css/ios.css']);
}
@ -623,8 +630,25 @@ var AppInfo = {};
require(["playerSelectionMenu", "fullscreenManager"]);
if (!AppInfo.isNativeApp && window.ApiClient) {
require(["css!" + ApiClient.getUrl("Branding/Css")]);
var apiClient = window.ConnectionManager && window.ConnectionManager.currentApiClient();
if (apiClient) {
fetch(apiClient.getUrl("Branding/Css"))
.then(function(response) {
if (!response.ok) {
throw new Error(response.status + ' ' + response.statusText);
}
return response.text();
})
.then(function(css) {
// Inject the branding css as a dom element in body so it will take
// precedence over other stylesheets
var style = document.createElement('style');
style.appendChild(document.createTextNode(css));
document.body.appendChild(style);
})
.catch(function(err) {
console.warn('Error applying custom css', err);
});
}
});
});
@ -635,7 +659,7 @@ var AppInfo = {};
try {
navigator.serviceWorker.register("serviceworker.js");
} catch (err) {
console.log("Error registering serviceWorker: " + err);
console.error("error registering serviceWorker: " + err);
}
}
}
@ -647,11 +671,7 @@ var AppInfo = {};
AppInfo.isNativeApp = true;
}
if (!window.Promise || browser.web0s) {
require(["native-promise-only"], init);
} else {
init();
}
init();
}
var localApiClient;
@ -715,7 +735,8 @@ var AppInfo = {};
"sortable",
"libjass",
"webcomponents",
"material-icons"
"material-icons",
"jellyfin-noto"
]
},
urlArgs: urlArgs,
@ -730,6 +751,7 @@ var AppInfo = {};
});
require(["css!assets/css/site"]);
require(["jellyfin-noto"]);
// define styles
// TODO determine which of these files can be moved to the components themselves
@ -963,10 +985,6 @@ var AppInfo = {};
Dashboard.navigate("mypreferencesmenu.html");
};
appRouter.showNowPlaying = function () {
Dashboard.navigate("nowplaying.html");
};
appRouter.setTitle = function (title) {
LibraryMenu.setTitle(title);
};

30
src/scripts/userpassword.js
View file

@ -1,30 +0,0 @@
define(["jQuery", "loading", "libraryMenu"], function ($, loading, libraryMenu) {
"use strict";
function loadUser(page, user) {
libraryMenu.setTitle(user.Name);
if ("Guest" == user.ConnectLinkType) {
$(".connectMessage", page).show();
} else {
$(".connectMessage", page).hide();
}
loading.hide();
}
function loadData(page) {
loading.show();
var userId = getParameterByName("userId");
ApiClient.getUser(userId).then(function (user) {
loadUser(page, user);
});
}
$(document).on("pageinit", "#userPasswordPage", function () {
$(".adminUpdatePasswordForm").off("submit", UpdatePasswordPage.onSubmit).on("submit", UpdatePasswordPage.onSubmit);
$(".adminLocalAccessForm").off("submit", UpdatePasswordPage.onLocalAccessSubmit).on("submit", UpdatePasswordPage.onLocalAccessSubmit);
}).on("pagebeforeshow", "#userPasswordPage", function () {
loadData(this);
});
});