"), enableScrollX()) {
+ var group = groups[i];
+ var supportsImageAnalysis = appHost.supports("imageanalysis");
+ var cardLayout = appHost.preferVisualCards || supportsImageAnalysis;
+
+ cardLayout = true;
+ if (group.name) {
+ html += '
';
+ html += '
' + group.name + "
";
+ }
+ if (enableScrollX()) {
var scrollXClass = "scrollX hiddenScrollX";
- layoutManager.tv && (scrollXClass += " smoothScrollX"), html += '
";
+ }
}
- return Promise.resolve(html)
+
+ return Promise.resolve(html);
}
+
window.LiveTvHelpers = {
getTimersHtml: getTimersHtml
- }
-});
\ No newline at end of file
+ };
+});
diff --git a/src/scripts/playlistedit.js b/src/scripts/playlistedit.js
index ef0615e2ba..32a3a960a4 100644
--- a/src/scripts/playlistedit.js
+++ b/src/scripts/playlistedit.js
@@ -1,39 +1,50 @@
-define(["listView"], function(listView) {
+define(["listView"], function (listView) {
"use strict";
function getFetchPlaylistItemsFn(itemId) {
- return function() {
+ return function () {
var query = {
Fields: "PrimaryImageAspectRatio,UserData",
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
UserId: ApiClient.getCurrentUserId()
};
- return ApiClient.getJSON(ApiClient.getUrl("Playlists/" + itemId + "/Items", query))
- }
+ return ApiClient.getJSON(ApiClient.getUrl("Playlists/" + itemId + "/Items", query));
+ };
}
function getItemsHtmlFn(itemId) {
- return function(items) {
+ return function (items) {
return listView.getListViewHtml({
items: items,
- showIndex: !1,
- showRemoveFromPlaylist: !0,
- playFromHere: !0,
+ showIndex: false,
+ showRemoveFromPlaylist: true,
+ playFromHere: true,
action: "playallfromhere",
- smallIcon: !0,
- dragHandle: !0,
+ smallIcon: true,
+ dragHandle: true,
playlistId: itemId
- })
- }
+ });
+ };
}
function init(page, item) {
var elem = page.querySelector("#childrenContent .itemsContainer");
- elem.classList.add("vertical-list"), elem.classList.remove("vertical-wrap"), elem.enableDragReordering(!0), elem.fetchData = getFetchPlaylistItemsFn(item.Id), elem.getItemsHtml = getItemsHtmlFn(item.Id)
+ elem.classList.add("vertical-list");
+ elem.classList.remove("vertical-wrap");
+ elem.enableDragReordering(true);
+ elem.fetchData = getFetchPlaylistItemsFn(item.Id);
+ elem.getItemsHtml = getItemsHtmlFn(item.Id);
}
+
window.PlaylistViewer = {
- render: function(page, item) {
- page.playlistInit || (page.playlistInit = !0, init(page, item)), page.querySelector("#childrenContent").classList.add("verticalSection-extrabottompadding"), page.querySelector("#childrenContent .itemsContainer").refreshItems()
+ render: function (page, item) {
+ if (!page.playlistInit) {
+ page.playlistInit = true;
+ init(page, item);
+ }
+
+ page.querySelector("#childrenContent").classList.add("verticalSection-extrabottompadding");
+ page.querySelector("#childrenContent .itemsContainer").refreshItems();
}
- }
-});
\ No newline at end of file
+ };
+});
diff --git a/src/scripts/playlists.js b/src/scripts/playlists.js
index ee9fac6c58..91c49017da 100644
--- a/src/scripts/playlists.js
+++ b/src/scripts/playlists.js
@@ -1,124 +1,186 @@
-define(["loading", "listView", "cardBuilder", "libraryMenu", "libraryBrowser", "apphost", "imageLoader", "emby-itemscontainer"], function(loading, listView, cardBuilder, libraryMenu, libraryBrowser, appHost, imageLoader) {
+define(["loading", "listView", "cardBuilder", "libraryMenu", "libraryBrowser", "apphost", "imageLoader", "emby-itemscontainer"], function (loading, listView, cardBuilder, libraryMenu, libraryBrowser, appHost, imageLoader) {
"use strict";
- return function(view, params) {
+
+ return function (view, params) {
function getPageData(context) {
- var key = getSavedQueryKey(context),
- pageData = data[key];
- return pageData || (pageData = data[key] = {
- query: {
- SortBy: "SortName",
- SortOrder: "Ascending",
- IncludeItemTypes: "Playlist",
- Recursive: !0,
- Fields: "PrimaryImageAspectRatio,SortName,CumulativeRunTimeTicks,CanDelete",
- StartIndex: 0,
- Limit: 100
- },
- view: libraryBrowser.getSavedView(key) || "Poster"
- }, pageData.query.ParentId = libraryMenu.getTopParentId(), libraryBrowser.loadSavedQueryValues(key, pageData.query)), pageData
+ var key = getSavedQueryKey(context);
+ var pageData = data[key];
+
+ if (!pageData) {
+ pageData = data[key] = {
+ query: {
+ SortBy: "SortName",
+ SortOrder: "Ascending",
+ IncludeItemTypes: "Playlist",
+ Recursive: true,
+ Fields: "PrimaryImageAspectRatio,SortName,CumulativeRunTimeTicks,CanDelete",
+ StartIndex: 0,
+ Limit: 100
+ },
+ view: libraryBrowser.getSavedView(key) || "Poster"
+ };
+ pageData.query.ParentId = libraryMenu.getTopParentId();
+ libraryBrowser.loadSavedQueryValues(key, pageData.query);
+ }
+
+ return pageData;
}
function getQuery(context) {
- return getPageData(context).query
+ return getPageData(context).query;
}
function getSavedQueryKey(context) {
- return context.savedQueryKey || (context.savedQueryKey = libraryBrowser.getSavedQueryKey()), context.savedQueryKey
+ if (!context.savedQueryKey) {
+ context.savedQueryKey = libraryBrowser.getSavedQueryKey();
+ }
+
+ return context.savedQueryKey;
}
function showLoadingMessage() {
- loading.show()
+ loading.show();
}
function hideLoadingMessage() {
- loading.hide()
+ loading.hide();
}
function onViewStyleChange() {
- var viewStyle = getPageData(view).view,
- itemsContainer = view.querySelector(".itemsContainer");
- "List" == viewStyle ? (itemsContainer.classList.add("vertical-list"), itemsContainer.classList.remove("vertical-wrap")) : (itemsContainer.classList.remove("vertical-list"), itemsContainer.classList.add("vertical-wrap")), itemsContainer.innerHTML = ""
+ var viewStyle = getPageData(view).view;
+ var itemsContainer = view.querySelector(".itemsContainer");
+
+ if ("List" == viewStyle) {
+ itemsContainer.classList.add("vertical-list");
+ itemsContainer.classList.remove("vertical-wrap");
+ } else {
+ itemsContainer.classList.remove("vertical-list");
+ itemsContainer.classList.add("vertical-wrap");
+ }
+
+ itemsContainer.innerHTML = "";
}
function reloadItems() {
showLoadingMessage();
- var query = getQuery(view),
- promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query),
- promise2 = Dashboard.getCurrentUser();
- Promise.all([promise1, promise2]).then(function(responses) {
+ var query = getQuery(view);
+ var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query);
+ var promise2 = Dashboard.getCurrentUser();
+ Promise.all([promise1, promise2]).then(function (responses) {
var result = responses[0];
responses[1];
window.scrollTo(0, 0);
- var html = "",
- viewStyle = getPageData(view).view;
+ var html = "";
+ var viewStyle = getPageData(view).view;
view.querySelector(".listTopPaging").innerHTML = libraryBrowser.getQueryPagingHtml({
startIndex: query.StartIndex,
limit: query.Limit,
totalRecordCount: result.TotalRecordCount,
- viewButton: !1,
- showLimit: !1,
- updatePageSizeSetting: !1,
- addLayoutButton: !0,
+ viewButton: false,
+ showLimit: false,
+ updatePageSizeSetting: false,
+ addLayoutButton: true,
layouts: "List,Poster,PosterCard,Thumb,ThumbCard",
currentLayout: viewStyle
- }), result.TotalRecordCount ? (html = "List" == viewStyle ? listView.getListViewHtml({
- items: result.Items,
- sortBy: query.SortBy
- }) : "PosterCard" == viewStyle ? cardBuilder.getCardsHtml({
- items: result.Items,
- shape: "square",
- coverImage: !0,
- showTitle: !0,
- cardLayout: !0
- }) : "Thumb" == viewStyle ? cardBuilder.getCardsHtml({
- items: result.Items,
- shape: "backdrop",
- showTitle: !0,
- centerText: !0,
- preferThumb: !0,
- overlayPlayButton: !0
- }) : "ThumbCard" == viewStyle ? cardBuilder.getCardsHtml({
- items: result.Items,
- shape: "backdrop",
- showTitle: !0,
- preferThumb: !0,
- cardLayout: !0
- }) : cardBuilder.getCardsHtml({
- items: result.Items,
- shape: "square",
- showTitle: !0,
- coverImage: !0,
- centerText: !0,
- overlayPlayButton: !0
- }), view.querySelector(".noItemsMessage").classList.add("hide")) : view.querySelector(".noItemsMessage").classList.remove("hide");
+ });
+
+ if (result.TotalRecordCount) {
+ if (viewStyle == "List") {
+ html = listView.getListViewHtml({
+ items: result.Items,
+ sortBy: query.SortBy
+ });
+ } else if (viewStyle == "PosterCard") {
+ html = cardBuilder.getCardsHtml({
+ items: result.Items,
+ shape: "square",
+ coverImage: true,
+ showTitle: true,
+ cardLayout: true
+ });
+ } else if (viewStyle == "Thumb") {
+ html = cardBuilder.getCardsHtml({
+ items: result.Items,
+ shape: "backdrop",
+ showTitle: true,
+ centerText: true,
+ preferThumb: true,
+ overlayPlayButton: true
+ });
+ } else if (viewStyle == "ThumbCard") {
+ html = cardBuilder.getCardsHtml({
+ items: result.Items,
+ shape: "backdrop",
+ showTitle: true,
+ preferThumb: true,
+ cardLayout: true
+ });
+ } else {
+ html = cardBuilder.getCardsHtml({
+ items: result.Items,
+ shape: "square",
+ showTitle: true,
+ coverImage: true,
+ centerText: true,
+ overlayPlayButton: true
+ });
+ }
+ view.querySelector(".noItemsMessage").classList.add("hide");
+ } else {
+ view.querySelector(".noItemsMessage").classList.remove("hide");
+ }
+
var elem = view.querySelector(".itemsContainer");
- elem.innerHTML = html, imageLoader.lazyChildren(elem);
+ elem.innerHTML = html;
+ imageLoader.lazyChildren(elem);
var btnNextPage = view.querySelector(".btnNextPage");
- btnNextPage && btnNextPage.addEventListener("click", function() {
- query.StartIndex += query.Limit, reloadItems()
- });
+
+ if (btnNextPage) {
+ btnNextPage.addEventListener("click", function () {
+ query.StartIndex += query.Limit;
+ reloadItems();
+ });
+ }
+
var btnPreviousPage = view.querySelector(".btnPreviousPage");
- btnPreviousPage && btnPreviousPage.addEventListener("click", function() {
- query.StartIndex -= query.Limit, reloadItems()
- });
+
+ if (btnPreviousPage) {
+ btnPreviousPage.addEventListener("click", function () {
+ query.StartIndex -= query.Limit;
+ reloadItems();
+ });
+ }
+
var btnChangeLayout = view.querySelector(".btnChangeLayout");
- btnChangeLayout && btnChangeLayout.addEventListener("layoutchange", function(e) {
- var layout = e.detail.viewStyle;
- getPageData(view).view = layout, libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout), onViewStyleChange(), reloadItems()
- }), libraryBrowser.saveQueryValues(getSavedQueryKey(view), query), hideLoadingMessage()
- })
+
+ if (btnChangeLayout) {
+ btnChangeLayout.addEventListener("layoutchange", function (e) {
+ var layout = e.detail.viewStyle;
+ getPageData(view).view = layout;
+ libraryBrowser.saveViewSetting(getSavedQueryKey(view), layout);
+ onViewStyleChange();
+ reloadItems();
+ });
+ }
+
+ libraryBrowser.saveQueryValues(getSavedQueryKey(view), query);
+ hideLoadingMessage();
+ });
}
+
var data = {};
- view.addEventListener("viewbeforeshow", function() {
- reloadItems()
- }), view.querySelector(".btnNewPlaylist").addEventListener("click", function() {
- require(["playlistEditor"], function(playlistEditor) {
+ view.addEventListener("viewbeforeshow", function () {
+ reloadItems();
+ });
+ view.querySelector(".btnNewPlaylist").addEventListener("click", function () {
+ require(["playlistEditor"], function (playlistEditor) {
var serverId = ApiClient.serverInfo().Id;
- (new playlistEditor).show({
+ new playlistEditor().show({
items: [],
serverId: serverId
- })
- })
- }), onViewStyleChange()
- }
-});
\ No newline at end of file
+ });
+ });
+ });
+ onViewStyleChange();
+ };
+});
diff --git a/src/scripts/searchtab.js b/src/scripts/searchtab.js
index 538770e42e..c0852bfc77 100644
--- a/src/scripts/searchtab.js
+++ b/src/scripts/searchtab.js
@@ -1,30 +1,54 @@
-define(["searchFields", "searchResults", "events"], function(SearchFields, SearchResults, events) {
+define(["searchFields", "searchResults", "events"], function (SearchFields, SearchResults, events) {
"use strict";
function init(instance, tabContent, options) {
- tabContent.innerHTML = '
', instance.searchFields = new SearchFields({
+ tabContent.innerHTML = '
';
+ instance.searchFields = new SearchFields({
element: tabContent.querySelector(".searchFields")
- }), instance.searchResults = new SearchResults({
+ });
+ instance.searchResults = new SearchResults({
element: tabContent.querySelector(".searchResults"),
serverId: ApiClient.serverId(),
parentId: options.parentId,
collectionType: options.collectionType
- }), events.on(instance.searchFields, "search", function(e, value) {
- instance.searchResults.search(value)
- })
+ });
+ events.on(instance.searchFields, "search", function (e, value) {
+ instance.searchResults.search(value);
+ });
}
function SearchTab(view, tabContent, options) {
var self = this;
- options = options || {}, init(this, tabContent, options), self.preRender = function() {}, self.renderTab = function() {
+ options = options || {};
+ init(this, tabContent, options);
+
+ self.preRender = function () {};
+
+ self.renderTab = function () {
var searchFields = this.searchFields;
- searchFields && searchFields.focus()
- }
+
+ if (searchFields) {
+ searchFields.focus();
+ }
+ };
}
- return SearchTab.prototype.destroy = function() {
+
+ SearchTab.prototype.destroy = function () {
var searchFields = this.searchFields;
- searchFields && searchFields.destroy(), this.searchFields = null;
+
+ if (searchFields) {
+ searchFields.destroy();
+ }
+
+ this.searchFields = null;
var searchResults = this.searchResults;
- searchResults && searchResults.destroy(), this.searchResults = null
- }, SearchTab
-});
\ No newline at end of file
+
+ if (searchResults) {
+ searchResults.destroy();
+ }
+
+ this.searchResults = null;
+ };
+
+ return SearchTab;
+});
diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js
index d41cf7b5c2..f9774167c0 100644
--- a/src/scripts/taskbutton.js
+++ b/src/scripts/taskbutton.js
@@ -1,48 +1,119 @@
-define(["events", "userSettings", "serverNotifications", "connectionManager", "emby-button"], function(events, userSettings, serverNotifications, connectionManager) {
+define(["events", "userSettings", "serverNotifications", "connectionManager", "emby-button"], function (events, userSettings, serverNotifications, connectionManager) {
"use strict";
- return function(options) {
+
+ return function (options) {
function pollTasks() {
connectionManager.getApiClient(serverId).getScheduledTasks({
- IsEnabled: !0
- }).then(updateTasks)
+ IsEnabled: true
+ }).then(updateTasks);
}
function updateTasks(tasks) {
- var task = tasks.filter(function(t) {
- return t.Key == options.taskKey
+ var task = tasks.filter(function (t) {
+ return t.Key == options.taskKey;
})[0];
- if (options.panel && (task ? options.panel.classList.remove("hide") : options.panel.classList.add("hide")), task) {
- "Idle" == task.State ? button.removeAttribute("disabled") : button.setAttribute("disabled", "disabled"), button.setAttribute("data-taskid", task.Id);
- var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
- if (options.progressElem && (options.progressElem.value = progress, "Running" == task.State ? options.progressElem.classList.remove("hide") : options.progressElem.classList.add("hide")), options.lastResultElem) {
- var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : "";
- "Failed" == lastResult ? options.lastResultElem.html('
(' + Globalize.translate("LabelFailed") + ")") : "Cancelled" == lastResult ? options.lastResultElem.html('
(' + Globalize.translate("LabelCancelled") + ")") : "Aborted" == lastResult ? options.lastResultElem.html('
' + Globalize.translate("LabelAbortedByServerShutdown") + "") : options.lastResultElem.html(lastResult)
+
+ if (options.panel) {
+ if (task) {
+ options.panel.classList.remove('hide');
+ } else {
+ options.panel.classList.add('hide');
+ }
+ }
+
+ if (!task) {
+ return;
+ }
+
+ if (task.State == 'Idle') {
+ button.removeAttribute("disabled");
+ } else {
+ button.setAttribute("disabled", "disabled");
+ }
+
+ button.setAttribute("data-taskid", task.Id);
+ var progress = (task.CurrentProgressPercentage || 0).toFixed(1);
+
+ if (options.progressElem) {
+ options.progressElem.value = progress;
+
+ if (task.State == 'Running') {
+ options.progressElem.classList.remove('hide');
+ } else {
+ options.progressElem.classList.add('hide');
+ }
+ }
+
+ if (options.lastResultElem) {
+ var lastResult = task.LastExecutionResult ? task.LastExecutionResult.Status : '';
+
+ if (lastResult == "Failed") {
+ options.lastResultElem.html('
(' + Globalize.translate('LabelFailed') + ')');
+ } else if (lastResult == "Cancelled") {
+ options.lastResultElem.html('
(' + Globalize.translate('LabelCancelled') + ')');
+ } else if (lastResult == "Aborted") {
+ options.lastResultElem.html('
' + Globalize.translate('LabelAbortedByServerShutdown') + '');
+ } else {
+ options.lastResultElem.html(lastResult);
}
}
}
function onScheduledTaskMessageConfirmed(id) {
- connectionManager.getApiClient(serverId).startScheduledTask(id).then(pollTasks)
+ connectionManager.getApiClient(serverId).startScheduledTask(id).then(pollTasks);
}
function onButtonClick() {
- onScheduledTaskMessageConfirmed(this.getAttribute("data-taskid"))
+ onScheduledTaskMessageConfirmed(this.getAttribute("data-taskid"));
}
function onScheduledTasksUpdate(e, apiClient, info) {
- apiClient.serverId() === serverId && updateTasks(info)
+ if (apiClient.serverId() === serverId) {
+ updateTasks(info);
+ }
}
+ var pollInterval;
+ var button = options.button;
+ var serverId = ApiClient.serverId();
+
function onPollIntervalFired() {
- connectionManager.getApiClient(serverId).isMessageChannelOpen() || pollTasks()
+ if (!connectionManager.getApiClient(serverId).isMessageChannelOpen()) {
+ pollTasks();
+ }
}
- var pollInterval, button = options.button,
- serverId = ApiClient.serverId();
- options.panel && options.panel.classList.add("hide"), "off" == options.mode ? (button.removeEventListener("click", onButtonClick), events.off(serverNotifications, "ScheduledTasksInfo", onScheduledTasksUpdate), function() {
- connectionManager.getApiClient(serverId).sendMessage("ScheduledTasksInfoStop"), pollInterval && clearInterval(pollInterval)
- }()) : (button.addEventListener("click", onButtonClick), pollTasks(), function() {
+
+ function startInterval() {
var apiClient = connectionManager.getApiClient(serverId);
- pollInterval && clearInterval(pollInterval), apiClient.sendMessage("ScheduledTasksInfoStart", "1000,1000"), pollInterval = setInterval(onPollIntervalFired, 1e4)
- }(), events.on(serverNotifications, "ScheduledTasksInfo", onScheduledTasksUpdate))
- }
-});
\ No newline at end of file
+
+ if (pollInterval) {
+ clearInterval(pollInterval);
+ }
+ apiClient.sendMessage("ScheduledTasksInfoStart", "1000,1000");
+ pollInterval = setInterval(onPollIntervalFired, 5000);
+ }
+
+ function stopInterval() {
+ connectionManager.getApiClient(serverId).sendMessage("ScheduledTasksInfoStop");
+
+ if (pollInterval) {
+ clearInterval(pollInterval);
+ }
+ }
+
+ if (options.panel) {
+ options.panel.classList.add("hide");
+ }
+
+ if (options.mode == 'off') {
+ button.removeEventListener("click", onButtonClick);
+ events.off(serverNotifications, "ScheduledTasksInfo", onScheduledTasksUpdate);
+ stopInterval();
+ } else {
+ button.addEventListener("click", onButtonClick);
+ pollTasks();
+ startInterval();
+ events.on(serverNotifications, "ScheduledTasksInfo", onScheduledTasksUpdate);
+ }
+ };
+});
diff --git a/src/scripts/themeloader.js b/src/scripts/themeloader.js
index eb783b132d..ea7ff57f9a 100644
--- a/src/scripts/themeloader.js
+++ b/src/scripts/themeloader.js
@@ -1,15 +1,27 @@
-define(["userSettings", "skinManager", "connectionManager", "events"], function(userSettings, skinManager, connectionManager, events) {
+define(["userSettings", "skinManager", "connectionManager", "events"], function (userSettings, skinManager, connectionManager, events) {
"use strict";
+
var currentViewType;
- pageClassOn("viewbeforeshow", "page", function() {
- var classList = this.classList,
- viewType = classList.contains("type-interior") || classList.contains("wizardPage") ? "a" : "b";
+ pageClassOn("viewbeforeshow", "page", function () {
+ var classList = this.classList;
+ var viewType = classList.contains("type-interior") || classList.contains("wizardPage") ? "a" : "b";
+
if (viewType !== currentViewType) {
currentViewType = viewType;
- var theme, context;
- "a" === viewType ? (theme = userSettings.dashboardTheme(), context = "serverdashboard") : theme = userSettings.theme(), skinManager.setTheme(theme, context)
+ var theme;
+ var context;
+
+ if ("a" === viewType) {
+ theme = userSettings.dashboardTheme();
+ context = "serverdashboard";
+ } else {
+ theme = userSettings.theme();
+ }
+
+ skinManager.setTheme(theme, context);
}
- }), events.on(connectionManager, "localusersignedin", function(e, user) {
- currentViewType = null
- })
-});
\ No newline at end of file
+ });
+ events.on(connectionManager, "localusersignedin", function (e, user) {
+ currentViewType = null;
+ });
+});
diff --git a/src/scripts/userpassword.js b/src/scripts/userpassword.js
index 41dc290248..52e06e6cec 100644
--- a/src/scripts/userpassword.js
+++ b/src/scripts/userpassword.js
@@ -1,20 +1,30 @@
-define(["jQuery", "loading", "libraryMenu"], function($, loading, libraryMenu) {
+define(["jQuery", "loading", "libraryMenu"], function ($, loading, libraryMenu) {
"use strict";
function loadUser(page, user) {
- libraryMenu.setTitle(user.Name), "Guest" == user.ConnectLinkType ? $(".connectMessage", page).show() : $(".connectMessage", page).hide(), loading.hide()
+ 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)
- })
+ 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)
- })
-});
\ No newline at end of file
+
+ $(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);
+ });
+});
diff --git a/src/scripts/wizardagreement.js b/src/scripts/wizardagreement.js
index 77c12fb664..148b0ef39a 100644
--- a/src/scripts/wizardagreement.js
+++ b/src/scripts/wizardagreement.js
@@ -1,17 +1,27 @@
-define(["dom", "emby-button"], function(dom) {
+define(["dom", "emby-button"], function (dom) {
"use strict";
function onSubmit(e) {
- return dom.parentWithClass(this, "page").querySelector(".chkAccept").checked ? Dashboard.navigate("wizardfinish.html") : Dashboard.alert({
- message: Globalize.translate("MessagePleaseAcceptTermsOfServiceBeforeContinuing"),
- title: ""
- }), e.preventDefault(), !1
+ if (dom.parentWithClass(this, "page").querySelector(".chkAccept").checked) {
+ Dashboard.navigate("wizardfinish.html");
+ } else {
+ Dashboard.alert({
+ message: Globalize.translate("MessagePleaseAcceptTermsOfServiceBeforeContinuing"),
+ title: ""
+ });
+ }
+
+ e.preventDefault();
+ return false;
}
- return function(view, params) {
- view.querySelector(".wizardAgreementForm").addEventListener("submit", onSubmit), view.addEventListener("viewshow", function() {
- document.querySelector(".skinHeader").classList.add("noHomeButtonHeader")
- }), view.addEventListener("viewhide", function() {
- document.querySelector(".skinHeader").classList.remove("noHomeButtonHeader")
- })
- }
-});
\ No newline at end of file
+
+ return function (view, params) {
+ view.querySelector(".wizardAgreementForm").addEventListener("submit", onSubmit);
+ view.addEventListener("viewshow", function () {
+ document.querySelector(".skinHeader").classList.add("noHomeButtonHeader");
+ });
+ view.addEventListener("viewhide", function () {
+ document.querySelector(".skinHeader").classList.remove("noHomeButtonHeader");
+ });
+ };
+});