wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #568 from grafixeyehero/icon

Browse Source 
update Icon for medialibrarypage, userprofile, device, multiselect and installedplugins
This commit is contained in:
dkanada
2019-11-24 00:02:31 +09:00
committed by GitHub
parent 3d26136c5d 34474aea01
commit b7b34cba15
5 changed files with 113 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/multiselect/multiselect.js
+99 -96
View File
@@ -1,5 +1,5 @@
define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'appRouter', 'dom', 'css!./multiselect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
'use strict';
define(["browser", "appStorage", "apphost", "loading", "connectionManager", "globalize", "appRouter", "dom", "css!./multiselect"], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
"use strict";
var selectedItems = [];
var selectedElements = [];
@@ -15,12 +15,12 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
selectedItems = [];
selectedElements = [];
var elems = document.querySelectorAll('.itemSelectionPanel');
var elems = document.querySelectorAll(".itemSelectionPanel");
for (var i = 0, length = elems.length; i < length; i++) {
var parent = elems[i].parentNode;
parent.removeChild(elems[i]);
parent.classList.remove('withMultiSelect');
parent.classList.remove("withMultiSelect");
}
}
}
@@ -28,13 +28,13 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
function onItemSelectionPanelClick(e, itemSelectionPanel) {
// toggle the checkbox, if it wasn't clicked on
if (!dom.parentWithClass(e.target, 'chkItemSelect')) {
var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
if (!dom.parentWithClass(e.target, "chkItemSelect")) {
var chkItemSelect = itemSelectionPanel.querySelector(".chkItemSelect");
if (chkItemSelect) {
if (chkItemSelect.classList.contains('checkedInitial')) {
chkItemSelect.classList.remove('checkedInitial');
if (chkItemSelect.classList.contains("checkedInitial")) {
chkItemSelect.classList.remove("checkedInitial");
} else {
var newValue = !chkItemSelect.checked;
chkItemSelect.checked = newValue;
@@ -50,7 +50,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
function updateItemSelection(chkItemSelect, selected) {
var id = dom.parentWithAttribute(chkItemSelect, 'data-id').getAttribute('data-id');
var id = dom.parentWithAttribute(chkItemSelect, "data-id").getAttribute("data-id");
if (selected) {
@@ -73,7 +73,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
}
if (selectedItems.length) {
var itemSelectionCount = document.querySelector('.itemSelectionCount');
var itemSelectionCount = document.querySelector(".itemSelectionCount");
if (itemSelectionCount) {
itemSelectionCount.innerHTML = selectedItems.length;
}
@@ -88,27 +88,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
function showSelection(item, isChecked) {
var itemSelectionPanel = item.querySelector('.itemSelectionPanel');
var itemSelectionPanel = item.querySelector(".itemSelectionPanel");
if (!itemSelectionPanel) {
itemSelectionPanel = document.createElement('div');
itemSelectionPanel.classList.add('itemSelectionPanel');
itemSelectionPanel = document.createElement("div");
itemSelectionPanel.classList.add("itemSelectionPanel");
var parent = item.querySelector('.cardBox') || item.querySelector('.cardContent');
parent.classList.add('withMultiSelect');
var parent = item.querySelector(".cardBox") || item.querySelector(".cardContent");
parent.classList.add("withMultiSelect");
parent.appendChild(itemSelectionPanel);
var cssClass = 'chkItemSelect';
var cssClass = "chkItemSelect";
if (isChecked && !browser.firefox) {
// In firefox, the initial tap hold doesnt' get treated as a click
// In other browsers it does, so we need to make sure that initial click is ignored
cssClass += ' checkedInitial';
cssClass += " checkedInitial";
}
var checkedAttribute = isChecked ? ' checked' : '';
var checkedAttribute = isChecked ? " checked" : "";
itemSelectionPanel.innerHTML = '<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" data-outlineclass="multiSelectCheckboxOutline" class="' + cssClass + '"' + checkedAttribute + '/><span></span></label>';
var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
chkItemSelect.addEventListener('change', onSelectionChange);
var chkItemSelect = itemSelectionPanel.querySelector(".chkItemSelect");
chkItemSelect.addEventListener("change", onSelectionChange);
}
}
@@ -118,27 +118,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
if (!selectionCommandsPanel) {
selectionCommandsPanel = document.createElement('div');
selectionCommandsPanel.classList.add('selectionCommandsPanel');
selectionCommandsPanel = document.createElement("div");
selectionCommandsPanel.classList.add("selectionCommandsPanel");
document.body.appendChild(selectionCommandsPanel);
currentSelectionCommandsPanel = selectionCommandsPanel;
var html = '';
var html = "";
html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><i class="md-icon">close</i></button>';
html += '<h1 class="itemSelectionCount"></h1>';
var moreIcon = '&#xE5D3;';
var moreIcon = "&#xE5D3;";
html += '<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><i class="md-icon">' + moreIcon + '</i></button>';
selectionCommandsPanel.innerHTML = html;
selectionCommandsPanel.querySelector('.btnCloseSelectionPanel').addEventListener('click', hideSelections);
selectionCommandsPanel.querySelector(".btnCloseSelectionPanel").addEventListener("click", hideSelections);
var btnSelectionPanelOptions = selectionCommandsPanel.querySelector('.btnSelectionPanelOptions');
var btnSelectionPanelOptions = selectionCommandsPanel.querySelector(".btnSelectionPanelOptions");
dom.addEventListener(btnSelectionPanelOptions, 'click', showMenuForSelectedItems, { passive: true });
dom.addEventListener(btnSelectionPanelOptions, "click", showMenuForSelectedItems, { passive: true });
}
}
@@ -146,7 +146,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
return new Promise(function (resolve, reject) {
require(['alert'], function (alert) {
require(["alert"], function (alert) {
alert(options).then(resolve, resolve);
});
});
@@ -156,15 +156,15 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
return new Promise(function (resolve, reject) {
var msg = globalize.translate('ConfirmDeleteItem');
var title = globalize.translate('HeaderDeleteItem');
var msg = globalize.translate("ConfirmDeleteItem");
var title = globalize.translate("HeaderDeleteItem");
if (itemIds.length > 1) {
msg = globalize.translate('ConfirmDeleteItems');
title = globalize.translate('HeaderDeleteItems');
msg = globalize.translate("ConfirmDeleteItems");
title = globalize.translate("HeaderDeleteItems");
}
require(['confirm'], function (confirm) {
require(["confirm"], function (confirm) {
confirm(msg, title).then(function () {
var promises = itemIds.map(function (itemId) {
@@ -173,7 +173,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
Promise.all(promises).then(resolve, function () {
alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject);
alertText(globalize.translate("ErrorDeletingItem")).then(reject, reject);
});
}, reject);
@@ -190,55 +190,58 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
var menuItems = [];
menuItems.push({
name: globalize.translate('AddToCollection'),
id: 'addtocollection',
ironIcon: 'add'
name: globalize.translate("AddToCollection"),
id: "addtocollection",
icon: "add"
});
menuItems.push({
name: globalize.translate('AddToPlaylist'),
id: 'playlist',
ironIcon: 'playlist-add'
name: globalize.translate("AddToPlaylist"),
id: "playlist",
icon: "playlist_add"
});
// TODO: Be more dynamic based on what is selected
if (user.Policy.EnableContentDeletion) {
menuItems.push({
name: globalize.translate('Delete'),
id: 'delete',
ironIcon: 'delete'
name: globalize.translate("Delete"),
id: "delete",
icon: "delete"
});
}
if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
if (user.Policy.EnableContentDownloading && appHost.supports("filedownload")) {
menuItems.push({
name: Globalize.translate('ButtonDownload'),
id: 'download',
ironIcon: 'file-download'
name: Globalize.translate("ButtonDownload"),
id: "download",
icon: "file_download"
});
}
if (user.Policy.IsAdministrator) {
menuItems.push({
name: globalize.translate('GroupVersions'),
id: 'groupvideos',
ironIcon: 'call-merge'
name: globalize.translate("GroupVersions"),
id: "groupvideos",
icon: "call_merge"
});
}
menuItems.push({
name: globalize.translate('MarkPlayed'),
id: 'markplayed'
name: globalize.translate("MarkPlayed"),
id: "markplayed",
icon: "check_box"
});
menuItems.push({
name: globalize.translate('MarkUnplayed'),
id: 'markunplayed'
name: globalize.translate("MarkUnplayed"),
id: "markunplayed",
icon: "check_box_outline_blank"
});
menuItems.push({
name: globalize.translate('RefreshMetadata'),
id: 'refresh'
name: globalize.translate("RefreshMetadata"),
id: "refresh",
icon: "refresh"
});
require(['actionsheet'], function (actionsheet) {
@@ -250,8 +253,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
var serverId = apiClient.serverInfo().Id;
switch (id) {
case 'addtocollection':
require(['collectionEditor'], function (collectionEditor) {
case "addtocollection":
require(["collectionEditor"], function (collectionEditor) {
new collectionEditor().show({
items: items,
serverId: serverId
@@ -260,8 +263,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
hideSelections();
dispatchNeedsRefresh();
break;
case 'playlist':
require(['playlistEditor'], function (playlistEditor) {
case "playlist":
require(["playlistEditor"], function (playlistEditor) {
new playlistEditor().show({
items: items,
serverId: serverId
@@ -270,30 +273,30 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
hideSelections();
dispatchNeedsRefresh();
break;
case 'delete':
case "delete":
deleteItems(apiClient, items).then(dispatchNeedsRefresh);
hideSelections();
dispatchNeedsRefresh();
break;
case 'groupvideos':
case "groupvideos":
combineVersions(apiClient, items);
break;
case 'markplayed':
case "markplayed":
items.forEach(function (itemId) {
apiClient.markPlayed(apiClient.getCurrentUserId(), itemId);
});
hideSelections();
dispatchNeedsRefresh();
break;
case 'markunplayed':
case "markunplayed":
items.forEach(function (itemId) {
apiClient.markUnplayed(apiClient.getCurrentUserId(), itemId);
});
hideSelections();
dispatchNeedsRefresh();
break;
case 'refresh':
require(['refreshDialog'], function (refreshDialog) {
case "refresh":
require(["refreshDialog"], function (refreshDialog) {
new refreshDialog({
itemIds: items,
serverId: serverId
@@ -318,7 +321,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
[].forEach.call(selectedElements, function (i) {
var container = dom.parentWithAttribute(i, 'is', 'emby-itemscontainer');
var container = dom.parentWithAttribute(i, "is", "emby-itemscontainer");
if (container && elems.indexOf(container) === -1) {
elems.push(container);
@@ -334,9 +337,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
if (selection.length < 2) {
require(['alert'], function (alert) {
require(["alert"], function (alert) {
alert({
text: globalize.translate('PleaseSelectTwoItems')
text: globalize.translate("PleaseSelectTwoItems")
});
});
return;
@@ -347,7 +350,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
apiClient.ajax({
type: "POST",
url: apiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(',') })
url: apiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(",") })
}).then(function () {
@@ -359,8 +362,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
function showSelections(initialCard) {
require(['emby-checkbox'], function () {
var cards = document.querySelectorAll('.card');
require(["emby-checkbox"], function () {
var cards = document.querySelectorAll(".card");
for (var i = 0, length = cards.length; i < length; i++) {
showSelection(cards[i], initialCard === cards[i]);
}
@@ -376,9 +379,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
if (selectedItems.length) {
var card = dom.parentWithClass(target, 'card');
var card = dom.parentWithClass(target, "card");
if (card) {
var itemSelectionPanel = card.querySelector('.itemSelectionPanel');
var itemSelectionPanel = card.querySelector(".itemSelectionPanel");
if (itemSelectionPanel) {
return onItemSelectionPanelClick(e, itemSelectionPanel);
}
@@ -390,7 +393,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
}
}
document.addEventListener('viewbeforehide', hideSelections);
document.addEventListener("viewbeforehide", hideSelections);
return function (options) {
@@ -400,7 +403,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
function onTapHold(e) {
var card = dom.parentWithClass(e.target, 'card');
var card = dom.parentWithClass(e.target, "card");
if (card) {
@@ -437,7 +440,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
var element = touch.target;
if (element) {
var card = dom.parentWithClass(element, 'card');
var card = dom.parentWithClass(element, "card");
if (card) {
@@ -506,7 +509,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
return;
}
var card = dom.parentWithClass(touchTarget, 'card');
var card = dom.parentWithClass(touchTarget, "card");
touchTarget = null;
if (card) {
@@ -519,27 +522,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
// mobile safari doesn't allow contextmenu override
if (browser.touch && !browser.safari) {
element.addEventListener('contextmenu', onTapHold);
element.addEventListener("contextmenu", onTapHold);
} else {
dom.addEventListener(element, 'touchstart', onTouchStart, {
dom.addEventListener(element, "touchstart", onTouchStart, {
passive: true
});
dom.addEventListener(element, 'touchmove', onTouchMove, {
dom.addEventListener(element, "touchmove", onTouchMove, {
passive: true
});
dom.addEventListener(element, 'touchend', onTouchEnd, {
dom.addEventListener(element, "touchend", onTouchEnd, {
passive: true
});
dom.addEventListener(element, 'touchcancel', onTouchEnd, {
dom.addEventListener(element, "touchcancel", onTouchEnd, {
passive: true
});
dom.addEventListener(element, 'mousedown', onMouseDown, {
dom.addEventListener(element, "mousedown", onMouseDown, {
passive: true
});
dom.addEventListener(element, 'mouseleave', onMouseOut, {
dom.addEventListener(element, "mouseleave", onMouseOut, {
passive: true
});
dom.addEventListener(element, 'mouseup', onMouseOut, {
dom.addEventListener(element, "mouseup", onMouseOut, {
passive: true
});
}
@@ -548,38 +551,38 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
initTapHold(container);
if (options.bindOnClick !== false) {
container.addEventListener('click', onContainerClick);
container.addEventListener("click", onContainerClick);
}
self.onContainerClick = onContainerClick;
self.destroy = function () {
container.removeEventListener('click', onContainerClick);
container.removeEventListener('contextmenu', onTapHold);
container.removeEventListener("click", onContainerClick);
container.removeEventListener("contextmenu", onTapHold);
var element = container;
dom.removeEventListener(element, 'touchstart', onTouchStart, {
dom.removeEventListener(element, "touchstart", onTouchStart, {
passive: true
});
dom.removeEventListener(element, 'touchmove', onTouchMove, {
dom.removeEventListener(element, "touchmove", onTouchMove, {
passive: true
});
dom.removeEventListener(element, 'touchend', onTouchEnd, {
dom.removeEventListener(element, "touchend", onTouchEnd, {
passive: true
});
// this fires in safari due to magnifying class
//dom.removeEventListener(element, 'touchcancel', onTouchEnd, {
//dom.removeEventListener(element, "touchcancel", onTouchEnd, {
// passive: true
//});
dom.removeEventListener(element, 'mousedown', onMouseDown, {
dom.removeEventListener(element, "mousedown", onMouseDown, {
passive: true
});
dom.removeEventListener(element, 'mouseleave', onMouseOut, {
dom.removeEventListener(element, "mouseleave", onMouseOut, {
passive: true
});
dom.removeEventListener(element, 'mouseup', onMouseOut, {
dom.removeEventListener(element, "mouseup", onMouseOut, {
passive: true
});
};
src/controllers/devices.js
+2 -2
View File
@@ -35,7 +35,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
menuItems.push({
name: globalize.translate("Edit"),
id: "open",
ironIcon: "mode-edit"
icon: "mode_edit"
});
}
@@ -43,7 +43,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
menuItems.push({
name: globalize.translate("Delete"),
id: "delete",
ironIcon: "delete"
icon: "delete"
});
}
src/controllers/installedplugins.js
+2 -2
View File
@@ -116,14 +116,14 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button"
menuItems.push({
name: globalize.translate("ButtonSettings"),
id: "open",
ironIcon: "mode-edit"
icon: "mode_edit"
});
}
menuItems.push({
name: globalize.translate("ButtonUninstall"),
id: "delete",
ironIcon: "delete"
icon: "delete"
});
require(["actionsheet"], function (actionsheet) {
src/controllers/medialibrarypage.js
+5 -5
View File
@@ -88,27 +88,27 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
menuItems.push({
name: globalize.translate("ButtonEditImages"),
id: "editimages",
ironIcon: "photo"
icon: "photo"
});
menuItems.push({
name: globalize.translate("ManageLibrary"),
id: "edit",
ironIcon: "folder_open"
icon: "folder_open"
});
menuItems.push({
name: globalize.translate("ButtonRemove"),
id: "delete",
ironIcon: "remove"
icon: "delete"
});
menuItems.push({
name: globalize.translate("ButtonRename"),
id: "rename",
ironIcon: "mode_edit"
icon: "mode_edit"
});
menuItems.push({
name: globalize.translate("ScanLibrary"),
id: "refresh",
ironIcon: "refresh"
icon: "refresh"
});
require(["actionsheet"], function (actionsheet) {
src/controllers/userprofilespage.js
+5 -5
View File
@@ -27,22 +27,22 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
menuItems.push({
name: globalize.translate("ButtonOpen"),
id: "open",
ironIcon: "mode-edit"
icon: "mode_edit"
});
menuItems.push({
name: globalize.translate("ButtonLibraryAccess"),
id: "access",
ironIcon: "lock"
icon: "lock"
});
menuItems.push({
name: globalize.translate("ButtonParentalControl"),
id: "parentalcontrol",
ironIcon: "person"
icon: "person"
});
menuItems.push({
name: globalize.translate("ButtonDelete"),
id: "delete",
ironIcon: "delete"
icon: "delete"
});
require(["actionsheet"], function (actionsheet) {
@@ -149,7 +149,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
menuItems.push({
name: globalize.translate("ButtonCancel"),
id: "delete",
ironIcon: "delete"
icon: "delete"
});
require(["actionsheet"], function (actionsheet) {