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

Fix up some additional deuglification failures

Browse source 
Replaced += on some strings
Declared `var i`in for loops rather than just using `i`
Fixed left over nest if, changed to else if
Switched to `===` for string to string comparisons
Unfurled ternary operator deuglification missed
...Applied suggestions from code review...
This commit is contained in:
Sparky 2019-01-19 11:05:30 -05:00
parent 858decb4bb
commit d090ac8d72
1 changed files with 57 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/scripts/librarymenu.js
View file

@ -104,7 +104,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
} }
function bindMenuEvents() { function bindMenuEvents() {
if (mainDrawerButton = document.querySelector(".mainDrawerButton")) { var mainDrawerButton = document.querySelector(".mainDrawerButton");
if (mainDrawerButton) {
mainDrawerButton.addEventListener("click", toggleMainDrawer); mainDrawerButton.addEventListener("click", toggleMainDrawer);
} }
@ -254,7 +256,11 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var pageUrls = link.getAttribute("data-pageurls"); var pageUrls = link.getAttribute("data-pageurls");
if (pageUrls && (pageUrls = pageUrls.split("|"), selected = pageUrls.filter(isUrlInCurrentView).length > 0), selected) { if (pageUrls) {
pageUrls = pageUrls.split("|");
selected = pageUrls.filter(isUrlInCurrentView).length > 0;
}
if (selected) {
link.classList.add("navMenuOption-selected"); link.classList.add("navMenuOption-selected");
var title = ""; var title = "";
link = link.querySelector("span") || link; link = link.querySelector("span") || link;
@ -433,31 +439,29 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
menuHtml += '<span class="navMenuOptionText">'; menuHtml += '<span class="navMenuOptionText">';
menuHtml += item.name; menuHtml += item.name;
menuHtml += "</span>"; menuHtml += "</span>";
return menuHtml += "</a>"; return menuHtml + "</a>";
} }
function getToolsMenuHtml(apiClient) { function getToolsMenuHtml(apiClient) {
return getToolsMenuLinks(apiClient).then(function (items) { return getToolsMenuLinks(apiClient).then(function (items) {
var i;
var length;
var item; var item;
var menuHtml = ""; var menuHtml = "";
for (menuHtml += '<div class="drawerContent">', i = 0, length = items.length; i < length; i++) { menuHtml += '<div class="drawerContent">';
for (var i = 0; i < items.length; i++) {
item = items[i]; item = items[i];
if (item.href) { if (item.href) {
menuHtml += getToolsLinkHtml(item); menuHtml += getToolsLinkHtml(item);
} else { }
if (item.name) { else if (item.name) {
menuHtml += '<h3 class="sidebarHeader">'; menuHtml += '<h3 class="sidebarHeader">';
menuHtml += item.name; menuHtml += item.name;
menuHtml += "</h3>"; menuHtml += "</h3>";
} }
} }
}
return menuHtml += "</div>"; return menuHtml + "</div>";
}); });
} }
@ -487,7 +491,8 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
for (var i = 0, length = items.length; i < length; i++) { for (var i = 0, length = items.length; i < length; i++) {
var view = items[i]; var view = items[i];
if (list.push(view), "livetv" == view.CollectionType) { list.push(view);
if ("livetv" == view.CollectionType) {
view.ImageTags = {}; view.ImageTags = {};
view.icon = "live_tv"; view.icon = "live_tv";
var guideView = Object.assign({}, view); var guideView = Object.assign({}, view);
@ -509,28 +514,34 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
if (elem) { if (elem) {
if (show) { if (show) {
elem.classList.remove("hide"); elem.classList.remove("hide");
} else { }
else {
elem.classList.add("hide"); elem.classList.add("hide");
} }
} }
} }
function updateLibraryMenu(user) { function updateLibraryMenu(user) {
// FIXME: Potential equivalent might be
// showBySelector(".lnkSyncToOtherDevices", !!user.Policy.EnableContentDownloading);
if (!user) { if (!user) {
showBySelector(".libraryMenuDownloads", false); showBySelector(".libraryMenuDownloads", false);
showBySelector(".lnkSyncToOtherDevices", false); showBySelector(".lnkSyncToOtherDevices", false);
return void showBySelector(".userMenuOptions", false); return void showBySelector(".userMenuOptions", false);
} }
// FIXME: Potentially the same as above
if (user.Policy.EnableContentDownloading) { if (user.Policy.EnableContentDownloading) {
showBySelector(".lnkSyncToOtherDevices", true); showBySelector(".lnkSyncToOtherDevices", true);
} else { }
else {
showBySelector(".lnkSyncToOtherDevices", false); showBySelector(".lnkSyncToOtherDevices", false);
} }
if (user.Policy.EnableContentDownloading && appHost.supports("sync")) { if (user.Policy.EnableContentDownloading && appHost.supports("sync")) {
showBySelector(".libraryMenuDownloads", true); showBySelector(".libraryMenuDownloads", true);
} else { }
else {
showBySelector(".libraryMenuDownloads", false); showBySelector(".libraryMenuDownloads", false);
} }
@ -549,38 +560,38 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var icon = "folder"; var icon = "folder";
var itemId = i.Id; var itemId = i.Id;
if ("channels" == i.CollectionType) { if ("channels" === i.CollectionType) {
itemId = "channels"; itemId = "channels";
} }
else if ("livetv" == i.CollectionType) { else if ("livetv" === i.CollectionType) {
itemId = "livetv"; itemId = "livetv";
} }
else if ("photos" == i.CollectionType) { else if ("photos" === i.CollectionType) {
icon = "photo_library"; icon = "photo_library";
} }
else if ("music" == i.CollectionType || "musicvideos" == i.CollectionType) { else if ("music" === i.CollectionType || "musicvideos" === i.CollectionType) {
icon = "library_music"; icon = "library_music";
} }
else if ("books" == i.CollectionType) { else if ("books" === i.CollectionType) {
icon = "library_books"; icon = "library_books";
} }
else if ("playlists" == i.CollectionType) { else if ("playlists" === i.CollectionType) {
icon = "view_list"; icon = "view_list";
} }
else if ("games" == i.CollectionType) { else if ("games" === i.CollectionType) {
icon = "games"; icon = "games";
} }
else if ("movies" == i.CollectionType) { else if ("movies" === i.CollectionType) {
icon = "video_library"; icon = "video_library";
} }
else if ("channels" == i.CollectionType || "Channel" == i.Type) { else if ("channels" === i.CollectionType || "Channel" === i.Type) {
icon = "videocam"; icon = "videocam";
} }
else if ("tvshows" == i.CollectionType) { else if ("tvshows" === i.CollectionType) {
icon = "tv"; icon = "tv";
} }
else if ("livetv" == i.CollectionType) { else if ("livetv" === i.CollectionType) {
icon = "live_tv"; icon = "live_tv";
} }
icon = i.icon || icon; icon = i.icon || icon;
@ -643,23 +654,23 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
var id = isLiveTvPage || isChannelsPage || isEditorPage || isMySyncPage || page.classList.contains("allLibraryPage") ? "" : getTopParentId() || ""; var id = isLiveTvPage || isChannelsPage || isEditorPage || isMySyncPage || page.classList.contains("allLibraryPage") ? "" : getTopParentId() || "";
var elems = document.getElementsByClassName("lnkMediaFolder"); var elems = document.getElementsByClassName("lnkMediaFolder");
for (i = 0, length = elems.length; i < length; i++) { for (var i = 0, length = elems.length; i < length; i++) {
var lnkMediaFolder = elems[i]; var lnkMediaFolder = elems[i];
var itemId = lnkMediaFolder.getAttribute("data-itemid"); var itemId = lnkMediaFolder.getAttribute("data-itemid");
if (isChannelsPage && "channels" == itemId) { if (isChannelsPage && "channels" === itemId) {
lnkMediaFolder.classList.add("navMenuOption-selected"); lnkMediaFolder.classList.add("navMenuOption-selected");
} }
else if (isLiveTvPage && "livetv" == itemId) { else if (isLiveTvPage && "livetv" === itemId) {
lnkMediaFolder.classList.add("navMenuOption-selected"); lnkMediaFolder.classList.add("navMenuOption-selected");
} }
else if (isEditorPage && "editor" == itemId) { else if (isEditorPage && "editor" === itemId) {
lnkMediaFolder.classList.add("navMenuOption-selected"); lnkMediaFolder.classList.add("navMenuOption-selected");
} }
else if (isMySyncPage && "manageoffline" == itemId && -1 != window.location.href.toString().indexOf("mode=download")) { else if (isMySyncPage && "manageoffline" === itemId && -1 != window.location.href.toString().indexOf("mode=download")) {
lnkMediaFolder.classList.add("navMenuOption-selected"); lnkMediaFolder.classList.add("navMenuOption-selected");
} }
else if (isMySyncPage && "syncotherdevices" == itemId && -1 == window.location.href.toString().indexOf("mode=download")) { else if (isMySyncPage && "syncotherdevices" === itemId && -1 == window.location.href.toString().indexOf("mode=download")) {
lnkMediaFolder.classList.add("navMenuOption-selected"); lnkMediaFolder.classList.add("navMenuOption-selected");
} }
else if (id && itemId == id) { else if (id && itemId == id) {
@ -724,10 +735,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
if (title) { if (title) {
LibraryMenu.setTitle(title); LibraryMenu.setTitle(title);
} else {
if (page.classList.contains("standalonePage")) {
LibraryMenu.setDefaultTitle();
} }
else if (page.classList.contains("standalonePage")) {
LibraryMenu.setDefaultTitle();
} }
} }
@ -756,11 +766,15 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
function refreshLibraryDrawer(user) { function refreshLibraryDrawer(user) {
loadNavDrawer(); loadNavDrawer();
currentDrawerType = "library"; currentDrawerType = "library";
(user ? Promise.resolve(user) : connectionManager.user(getCurrentApiClient())).then(function (user) { if (user) {
Promise.resolve(user);
} else {
connectionManager.user(getCurrentApiClient()).then(function (user) {
refreshLibraryInfoInDrawer(user); refreshLibraryInfoInDrawer(user);
updateLibraryMenu(user.localUser); updateLibraryMenu(user.localUser);
}); });
} }
}
function getNavDrawerOptions() { function getNavDrawerOptions() {
var drawerWidth = screen.availWidth - 50; var drawerWidth = screen.availWidth - 50;