From dbf63c723cb860723aa1778248dc4c355f3b1ecf Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 3 Apr 2020 03:16:06 +0900 Subject: [PATCH 1/9] convert four more files to es6 --- package.json | 5 +- src/controllers/user/display.js | 6 +- src/controllers/user/home.js | 6 +- src/controllers/user/playback.js | 6 +- src/controllers/user/subtitles.js | 6 +- src/scripts/imagehelper.js | 12 ++-- src/scripts/settings/appSettings.js | 71 +++++++++++-------- ...userSettingsBuilder.js => userSettings.js} | 64 ++++++++--------- src/scripts/site.js | 5 +- 9 files changed, 91 insertions(+), 90 deletions(-) rename src/scripts/settings/{userSettingsBuilder.js => userSettings.js} (74%) diff --git a/package.json b/package.json index c0ff158ec..8a299555e 100644 --- a/package.json +++ b/package.json @@ -84,9 +84,12 @@ "src/components/filedownloader.js", "src/components/filesystem.js", "src/components/input/keyboardnavigation.js", + "src/components/scrollManager.js", "src/components/sanatizefilename.js", "src/scripts/settings/webSettings.js", - "src/components/scrollManager.js" + "src/scripts/settings/appSettings.js", + "src/scripts/settings/userSettings.js", + "src/scripts/imagehelper.js" ], "plugins": [ "@babel/plugin-transform-modules-amd" diff --git a/src/controllers/user/display.js b/src/controllers/user/display.js index f348f2875..28d39b7fd 100644 --- a/src/controllers/user/display.js +++ b/src/controllers/user/display.js @@ -1,4 +1,4 @@ -define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (DisplaySettings, userSettingsBuilder, currentUserSettings, autoFocuser) { +define(["displaySettings", "userSettings", "autoFocuser"], function (DisplaySettings, userSettings, autoFocuser) { "use strict"; return function (view, params) { @@ -11,7 +11,7 @@ define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"] var settingsInstance; var hasChanges; var userId = params.userId || ApiClient.getCurrentUserId(); - var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder(); + var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings(); view.addEventListener("viewshow", function () { window.addEventListener("beforeunload", onBeforeUnload); @@ -22,7 +22,7 @@ define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"] serverId: ApiClient.serverId(), userId: userId, element: view.querySelector(".settingsContainer"), - userSettings: userSettings, + userSettings: currentSettings, enableSaveButton: false, enableSaveConfirmation: false, autoFocus: autoFocuser.isEnabled() diff --git a/src/controllers/user/home.js b/src/controllers/user/home.js index 7f12efc7f..dccf6e506 100644 --- a/src/controllers/user/home.js +++ b/src/controllers/user/home.js @@ -1,4 +1,4 @@ -define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) { +define(["homescreenSettings", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, dom, globalize, loading, userSettings, autoFocuser) { "use strict"; return function (view, params) { @@ -11,7 +11,7 @@ define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loadin var homescreenSettingsInstance; var hasChanges; var userId = params.userId || ApiClient.getCurrentUserId(); - var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder(); + var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings(); view.addEventListener("viewshow", function () { window.addEventListener("beforeunload", onBeforeUnload); @@ -22,7 +22,7 @@ define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loadin serverId: ApiClient.serverId(), userId: userId, element: view.querySelector(".homeScreenSettingsContainer"), - userSettings: userSettings, + userSettings: currentSettings, enableSaveButton: false, enableSaveConfirmation: false, autoFocus: autoFocuser.isEnabled() diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback.js index 3def9d193..8f48e0264 100644 --- a/src/controllers/user/playback.js +++ b/src/controllers/user/playback.js @@ -1,4 +1,4 @@ -define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) { +define(["playbackSettings", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, dom, globalize, loading, userSettings, autoFocuser) { "use strict"; return function (view, params) { @@ -11,7 +11,7 @@ define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading" var settingsInstance; var hasChanges; var userId = params.userId || ApiClient.getCurrentUserId(); - var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder(); + var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings(); view.addEventListener("viewshow", function () { window.addEventListener("beforeunload", onBeforeUnload); @@ -22,7 +22,7 @@ define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading" serverId: ApiClient.serverId(), userId: userId, element: view.querySelector(".settingsContainer"), - userSettings: userSettings, + userSettings: currentSettings, enableSaveButton: false, enableSaveConfirmation: false, autoFocus: autoFocuser.isEnabled() diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js index 1f1102194..e2b98dc2d 100644 --- a/src/controllers/user/subtitles.js +++ b/src/controllers/user/subtitles.js @@ -1,4 +1,4 @@ -define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings, autoFocuser) { +define(["subtitleSettings", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettings, autoFocuser) { "use strict"; return function (view, params) { @@ -11,7 +11,7 @@ define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser" var subtitleSettingsInstance; var hasChanges; var userId = params.userId || ApiClient.getCurrentUserId(); - var userSettings = userId === ApiClient.getCurrentUserId() ? currentUserSettings : new userSettingsBuilder(); + var currentSettings = userId === ApiClient.getCurrentUserId() ? userSettings : new userSettings(); view.addEventListener("viewshow", function () { window.addEventListener("beforeunload", onBeforeUnload); @@ -22,7 +22,7 @@ define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser" serverId: ApiClient.serverId(), userId: userId, element: view.querySelector(".settingsContainer"), - userSettings: userSettings, + userSettings: currentSettings, enableSaveButton: false, enableSaveConfirmation: false, autoFocus: autoFocuser.isEnabled() diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js index a8c470269..51ecf439c 100644 --- a/src/scripts/imagehelper.js +++ b/src/scripts/imagehelper.js @@ -1,7 +1,6 @@ -define(["browser"], function (browser) { - "use strict"; +import browser from 'browser'; - function getDeviceIcon(device) { + export function getDeviceIcon(device) { var baseUrl = "assets/img/devices/"; switch (device.AppName || device.Client) { case "Samsung Smart TV": @@ -42,7 +41,7 @@ define(["browser"], function (browser) { } } - function getLibraryIcon(library) { + export function getLibraryIcon(library) { switch (library) { case "movies": return "video_library"; @@ -71,8 +70,7 @@ define(["browser"], function (browser) { } } - return { + export default { getDeviceIcon: getDeviceIcon, getLibraryIcon: getLibraryIcon - }; -}); + } diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js index 30fcf62e9..c654b0daa 100644 --- a/src/scripts/settings/appSettings.js +++ b/src/scripts/settings/appSettings.js @@ -1,5 +1,5 @@ -define(['appStorage', 'events'], function (appStorage, events) { - 'use strict'; +import appStorage from 'appStorage'; +import events from 'events'; function getKey(name, userId) { if (userId) { @@ -9,26 +9,23 @@ define(['appStorage', 'events'], function (appStorage, events) { return name; } - function AppSettings() { - } - - AppSettings.prototype.enableAutoLogin = function (val) { + export function enableAutoLogin(val) { if (val != null) { this.set('enableAutoLogin', val.toString()); } return this.get('enableAutoLogin') !== 'false'; - }; + } - AppSettings.prototype.enableSystemExternalPlayers = function (val) { + export function enableSystemExternalPlayers(val) { if (val !== null) { this.set('enableSystemExternalPlayers', val.toString()); } return this.get('enableSystemExternalPlayers') === 'true'; - }; + } - AppSettings.prototype.enableAutomaticBitrateDetection = function (isInNetwork, mediaType, val) { + export function enableAutomaticBitrateDetection(isInNetwork, mediaType, val) { var key = 'enableautobitratebitrate-' + mediaType + '-' + isInNetwork; if (val != null) { if (isInNetwork && mediaType === 'Audio') { @@ -43,9 +40,9 @@ define(['appStorage', 'events'], function (appStorage, events) { } else { return this.get(key) !== 'false'; } - }; + } - AppSettings.prototype.maxStreamingBitrate = function (isInNetwork, mediaType, val) { + export function maxStreamingBitrate(isInNetwork, mediaType, val) { var key = 'maxbitrate-' + mediaType + '-' + isInNetwork; if (val != null) { if (isInNetwork && mediaType === 'Audio') { @@ -61,43 +58,43 @@ define(['appStorage', 'events'], function (appStorage, events) { } else { return parseInt(this.get(key) || '0') || 1500000; } - }; + } - AppSettings.prototype.maxStaticMusicBitrate = function (val) { + export function maxStaticMusicBitrate(val) { if (val !== undefined) { this.set('maxStaticMusicBitrate', val); } var defaultValue = 320000; return parseInt(this.get('maxStaticMusicBitrate') || defaultValue.toString()) || defaultValue; - }; + } - AppSettings.prototype.maxChromecastBitrate = function (val) { + export function maxChromecastBitrate(val) { if (val != null) { this.set('chromecastBitrate1', val); } val = this.get('chromecastBitrate1'); return val ? parseInt(val) : null; - }; + } - AppSettings.prototype.syncOnlyOnWifi = function (val) { + export function syncOnlyOnWifi(val) { if (val != null) { this.set('syncOnlyOnWifi', val.toString()); } return this.get('syncOnlyOnWifi') !== 'false'; - }; + } - AppSettings.prototype.syncPath = function (val) { + export function syncPath(val) { if (val != null) { this.set('syncPath', val); } return this.get('syncPath'); - }; + } - AppSettings.prototype.cameraUploadServers = function (val) { + export function cameraUploadServers(val) { if (val != null) { this.set('cameraUploadServers', val.join(',')); } @@ -108,28 +105,40 @@ define(['appStorage', 'events'], function (appStorage, events) { } return []; - }; + } - AppSettings.prototype.runAtStartup = function (val) { + export function runAtStartup(val) { if (val != null) { this.set('runatstartup', val.toString()); } return this.get('runatstartup') === 'true'; - }; + } - AppSettings.prototype.set = function (name, value, userId) { + export function set(name, value, userId) { var currentValue = this.get(name, userId); appStorage.setItem(getKey(name, userId), value); if (currentValue !== value) { events.trigger(this, 'change', [name]); } - }; + } - AppSettings.prototype.get = function (name, userId) { + export function get(name, userId) { return appStorage.getItem(getKey(name, userId)); - }; + } - return new AppSettings(); -}); + export default { + enableAutoLogin: enableAutoLogin, + enableSystemExternalPlayers: enableSystemExternalPlayers, + enableAutomaticBitrateDetection: enableAutomaticBitrateDetection, + maxStreamingBitrate: maxStreamingBitrate, + maxStaticMusicBitrate: maxStaticMusicBitrate, + maxChromecastBitrate: maxChromecastBitrate, + syncOnlyOnWifi: syncOnlyOnWifi, + syncPath: syncPath, + cameraUploadServers: cameraUploadServers, + runAtStartup: runAtStartup, + set: set, + get: get + } diff --git a/src/scripts/settings/userSettingsBuilder.js b/src/scripts/settings/userSettings.js similarity index 74% rename from src/scripts/settings/userSettingsBuilder.js rename to src/scripts/settings/userSettings.js index 1a35434c6..28d2ef315 100644 --- a/src/scripts/settings/userSettingsBuilder.js +++ b/src/scripts/settings/userSettings.js @@ -1,5 +1,5 @@ -define(['appSettings', 'events'], function (appSettings, events) { - 'use strict'; +import appSettings from 'appSettings'; +import events from 'events'; function onSaveTimeout() { var self = this; @@ -15,10 +15,7 @@ define(['appSettings', 'events'], function (appSettings, events) { instance.saveTimeout = setTimeout(onSaveTimeout.bind(instance), 50); } - function UserSettings() { - } - - UserSettings.prototype.setUserInfo = function (userId, apiClient) { + export function setUserInfo(userId, apiClient) { if (this.saveTimeout) { clearTimeout(this.saveTimeout); } @@ -39,15 +36,15 @@ define(['appSettings', 'events'], function (appSettings, events) { }); }; - UserSettings.prototype.getData = function () { + export function getData() { return this.displayPrefs; }; - UserSettings.prototype.importFrom = function (instance) { + export function importFrom(instance) { this.displayPrefs = instance.getData(); }; - UserSettings.prototype.set = function (name, value, enableOnServer) { + export function set(name, value, enableOnServer) { var userId = this.currentUserId; var currentValue = this.get(name, enableOnServer); var result = appSettings.set(name, value, userId); @@ -64,7 +61,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return result; }; - UserSettings.prototype.get = function (name, enableOnServer) { + export function get(name, enableOnServer) { var userId = this.currentUserId; if (enableOnServer !== false && this.displayPrefs) { return this.displayPrefs.CustomPrefs[name]; @@ -73,7 +70,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return appSettings.get(name, userId); }; - UserSettings.prototype.serverConfig = function (config) { + export function serverConfig(config) { var apiClient = this.currentApiClient; if (config) { return apiClient.updateUserConfiguration(this.currentUserId, config); @@ -84,7 +81,7 @@ define(['appSettings', 'events'], function (appSettings, events) { }); }; - UserSettings.prototype.enableCinemaMode = function (val) { + export function enableCinemaMode(val) { if (val != null) { return this.set('enableCinemaMode', val.toString(), false); } @@ -93,7 +90,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return val !== 'false'; }; - UserSettings.prototype.enableNextVideoInfoOverlay = function (val) { + export function enableNextVideoInfoOverlay(val) { if (val != null) { return this.set('enableNextVideoInfoOverlay', val.toString()); } @@ -102,7 +99,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return val !== 'false'; }; - UserSettings.prototype.enableThemeSongs = function (val) { + export function enableThemeSongs(val) { if (val != null) { return this.set('enableThemeSongs', val.toString(), false); } @@ -111,7 +108,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return val !== 'false'; }; - UserSettings.prototype.enableThemeVideos = function (val) { + export function enableThemeVideos(val) { if (val != null) { return this.set('enableThemeVideos', val.toString(), false); } @@ -120,7 +117,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return val !== 'false'; }; - UserSettings.prototype.enableFastFadein = function (val) { + export function enableFastFadein(val) { if (val != null) { return this.set('fastFadein', val.toString(), false); } @@ -129,7 +126,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return val !== 'false'; }; - UserSettings.prototype.enableBackdrops = function (val) { + export function enableBackdrops(val) { if (val != null) { return this.set('enableBackdrops', val.toString(), false); } @@ -138,7 +135,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return val !== 'false'; }; - UserSettings.prototype.language = function (val) { + export function language(val) { if (val != null) { return this.set('language', val.toString(), false); } @@ -146,7 +143,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('language', false); }; - UserSettings.prototype.dateTimeLocale = function (val) { + export function dateTimeLocale(val) { if (val != null) { return this.set('datetimelocale', val.toString(), false); } @@ -154,7 +151,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('datetimelocale', false); }; - UserSettings.prototype.skipBackLength = function (val) { + export function skipBackLength(val) { if (val != null) { return this.set('skipBackLength', val.toString()); } @@ -162,7 +159,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return parseInt(this.get('skipBackLength') || '10000'); }; - UserSettings.prototype.skipForwardLength = function (val) { + export function skipForwardLength(val) { if (val != null) { return this.set('skipForwardLength', val.toString()); } @@ -170,7 +167,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return parseInt(this.get('skipForwardLength') || '30000'); }; - UserSettings.prototype.dashboardTheme = function (val) { + export function dashboardTheme(val) { if (val != null) { return this.set('dashboardTheme', val); } @@ -178,7 +175,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('dashboardTheme'); }; - UserSettings.prototype.skin = function (val) { + export function skin(val) { if (val != null) { return this.set('skin', val, false); } @@ -186,7 +183,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('skin', false); }; - UserSettings.prototype.theme = function (val) { + export function theme(val) { if (val != null) { return this.set('appTheme', val, false); } @@ -194,7 +191,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('appTheme', false); }; - UserSettings.prototype.screensaver = function (val) { + export function screensaver(val) { if (val != null) { return this.set('screensaver', val, false); } @@ -202,7 +199,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('screensaver', false); }; - UserSettings.prototype.soundEffects = function (val) { + export function soundEffects(val) { if (val != null) { return this.set('soundeffects', val, false); } @@ -210,7 +207,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.get('soundeffects', false); }; - UserSettings.prototype.loadQuerySettings = function (key, query) { + export function loadQuerySettings(key, query) { var values = this.get(key); if (values) { values = JSON.parse(values); @@ -220,7 +217,7 @@ define(['appSettings', 'events'], function (appSettings, events) { return query; }; - UserSettings.prototype.saveQuerySettings = function (key, query) { + export function saveQuerySettings(key, query) { var values = {}; if (query.SortBy) { values.SortBy = query.SortBy; @@ -233,23 +230,20 @@ define(['appSettings', 'events'], function (appSettings, events) { return this.set(key, JSON.stringify(values)); }; - UserSettings.prototype.getSubtitleAppearanceSettings = function (key) { + export function getSubtitleAppearanceSettings(key) { key = key || 'localplayersubtitleappearance3'; return JSON.parse(this.get(key, false) || '{}'); }; - UserSettings.prototype.setSubtitleAppearanceSettings = function (value, key) { + export function setSubtitleAppearanceSettings(value, key) { key = key || 'localplayersubtitleappearance3'; return this.set(key, JSON.stringify(value), false); }; - UserSettings.prototype.setFilter = function (key, value) { + export function setFilter(key, value) { return this.set(key, value, true); }; - UserSettings.prototype.getFilter = function (key) { + export function getFilter(key) { return this.get(key, true); }; - - return UserSettings; -}); diff --git a/src/scripts/site.js b/src/scripts/site.js index 513d0c075..5c10cecdd 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -768,10 +768,7 @@ var AppInfo = {}; define("webSettings", [scriptsPath + "/settings/webSettings"], returnFirstDependency); define("appSettings", [scriptsPath + "/settings/appSettings"], returnFirstDependency); - define("userSettingsBuilder", [scriptsPath + "/settings/userSettingsBuilder"], returnFirstDependency); - define("userSettings", ["userSettingsBuilder"], function(userSettingsBuilder) { - return new userSettingsBuilder(); - }); + define("userSettings", [scriptsPath + "/settings/userSettings"], returnFirstDependency); define("chromecastHelper", [componentsPath + "/chromecast/chromecasthelpers"], returnFirstDependency); define("mediaSession", [componentsPath + "/playback/mediasession"], returnFirstDependency); From 59539793dc3e597c6e4ae2854bc4893aa9d60a33 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 3 Apr 2020 03:16:22 +0900 Subject: [PATCH 2/9] remove unused file from source --- src/scripts/wizardagreement.js | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/scripts/wizardagreement.js diff --git a/src/scripts/wizardagreement.js b/src/scripts/wizardagreement.js deleted file mode 100644 index 148b0ef39..000000000 --- a/src/scripts/wizardagreement.js +++ /dev/null @@ -1,27 +0,0 @@ -define(["dom", "emby-button"], function (dom) { - "use strict"; - - function onSubmit(e) { - 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"); - }); - }; -}); From 4199297c17e260bbcadafcec486eb89928afffb0 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 3 Apr 2020 03:20:06 +0900 Subject: [PATCH 3/9] fix lint errors --- src/scripts/imagehelper.js | 2 ++ src/scripts/settings/appSettings.js | 2 ++ src/scripts/settings/userSettings.js | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js index 51ecf439c..21f987e62 100644 --- a/src/scripts/imagehelper.js +++ b/src/scripts/imagehelper.js @@ -1,3 +1,5 @@ +/* eslint-disable indent */ + import browser from 'browser'; export function getDeviceIcon(device) { diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js index c654b0daa..3b65495a1 100644 --- a/src/scripts/settings/appSettings.js +++ b/src/scripts/settings/appSettings.js @@ -1,3 +1,5 @@ +/* eslint-disable indent */ + import appStorage from 'appStorage'; import events from 'events'; diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js index 28d2ef315..cc38cb3d3 100644 --- a/src/scripts/settings/userSettings.js +++ b/src/scripts/settings/userSettings.js @@ -1,3 +1,5 @@ +/* eslint-disable indent */ + import appSettings from 'appSettings'; import events from 'events'; From 31b636b2a28f786dbbba8699fb7fd5720cb9dc71 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 3 Apr 2020 23:19:20 +0900 Subject: [PATCH 4/9] remove semicolons from closing brackets Co-Authored-By: Julien Machiels --- src/scripts/settings/userSettings.js | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js index cc38cb3d3..214983ebb 100644 --- a/src/scripts/settings/userSettings.js +++ b/src/scripts/settings/userSettings.js @@ -40,11 +40,11 @@ import events from 'events'; export function getData() { return this.displayPrefs; - }; + } export function importFrom(instance) { this.displayPrefs = instance.getData(); - }; + } export function set(name, value, enableOnServer) { var userId = this.currentUserId; @@ -61,7 +61,7 @@ import events from 'events'; } return result; - }; + } export function get(name, enableOnServer) { var userId = this.currentUserId; @@ -70,7 +70,7 @@ import events from 'events'; } return appSettings.get(name, userId); - }; + } export function serverConfig(config) { var apiClient = this.currentApiClient; @@ -81,7 +81,7 @@ import events from 'events'; return apiClient.getUser(this.currentUserId).then(function (user) { return user.Configuration; }); - }; + } export function enableCinemaMode(val) { if (val != null) { @@ -90,7 +90,7 @@ import events from 'events'; val = this.get('enableCinemaMode', false); return val !== 'false'; - }; + } export function enableNextVideoInfoOverlay(val) { if (val != null) { @@ -99,7 +99,7 @@ import events from 'events'; val = this.get('enableNextVideoInfoOverlay', false); return val !== 'false'; - }; + } export function enableThemeSongs(val) { if (val != null) { @@ -117,7 +117,7 @@ import events from 'events'; val = this.get('enableThemeVideos', false); return val !== 'false'; - }; + } export function enableFastFadein(val) { if (val != null) { @@ -126,7 +126,7 @@ import events from 'events'; val = this.get('fastFadein', false); return val !== 'false'; - }; + } export function enableBackdrops(val) { if (val != null) { @@ -135,7 +135,7 @@ import events from 'events'; val = this.get('enableBackdrops', false); return val !== 'false'; - }; + } export function language(val) { if (val != null) { @@ -143,7 +143,7 @@ import events from 'events'; } return this.get('language', false); - }; + } export function dateTimeLocale(val) { if (val != null) { @@ -151,7 +151,7 @@ import events from 'events'; } return this.get('datetimelocale', false); - }; + } export function skipBackLength(val) { if (val != null) { @@ -159,7 +159,7 @@ import events from 'events'; } return parseInt(this.get('skipBackLength') || '10000'); - }; + } export function skipForwardLength(val) { if (val != null) { @@ -167,7 +167,7 @@ import events from 'events'; } return parseInt(this.get('skipForwardLength') || '30000'); - }; + } export function dashboardTheme(val) { if (val != null) { @@ -175,7 +175,7 @@ import events from 'events'; } return this.get('dashboardTheme'); - }; + } export function skin(val) { if (val != null) { @@ -183,7 +183,7 @@ import events from 'events'; } return this.get('skin', false); - }; + } export function theme(val) { if (val != null) { @@ -191,7 +191,7 @@ import events from 'events'; } return this.get('appTheme', false); - }; + } export function screensaver(val) { if (val != null) { @@ -199,7 +199,7 @@ import events from 'events'; } return this.get('screensaver', false); - }; + } export function soundEffects(val) { if (val != null) { @@ -207,7 +207,7 @@ import events from 'events'; } return this.get('soundeffects', false); - }; + } export function loadQuerySettings(key, query) { var values = this.get(key); @@ -217,7 +217,7 @@ import events from 'events'; } return query; - }; + } export function saveQuerySettings(key, query) { var values = {}; @@ -230,22 +230,22 @@ import events from 'events'; } return this.set(key, JSON.stringify(values)); - }; + } export function getSubtitleAppearanceSettings(key) { key = key || 'localplayersubtitleappearance3'; return JSON.parse(this.get(key, false) || '{}'); - }; + } export function setSubtitleAppearanceSettings(value, key) { key = key || 'localplayersubtitleappearance3'; return this.set(key, JSON.stringify(value), false); - }; + } export function setFilter(key, value) { return this.set(key, value, true); - }; + } export function getFilter(key) { return this.get(key, true); - }; + } From a925152299c3c6489f115970d10415d6018ae8c0 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 4 Apr 2020 00:09:47 +0900 Subject: [PATCH 5/9] update valid branches on ci --- .ci/azure-pipelines.yml | 4 +--- src/scripts/settings/userSettings.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 7c7801b86..875c14c76 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -2,8 +2,7 @@ trigger: batch: true branches: include: - - master - - release-* + - '*' tags: include: - '*' @@ -27,7 +26,6 @@ jobs: BuildConfiguration: production Standalone: BuildConfiguration: standalone - maxParallel: 3 steps: - task: NodeTool@0 diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js index 214983ebb..d2cc131c6 100644 --- a/src/scripts/settings/userSettings.js +++ b/src/scripts/settings/userSettings.js @@ -36,7 +36,7 @@ import events from 'events'; result.CustomPrefs = result.CustomPrefs || {}; self.displayPrefs = result; }); - }; + } export function getData() { return this.displayPrefs; @@ -108,7 +108,7 @@ import events from 'events'; val = this.get('enableThemeSongs', false); return val !== 'false'; - }; + } export function enableThemeVideos(val) { if (val != null) { From ee307d7830328ad18149e7895217089bde6c9820 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 5 Apr 2020 04:16:17 +0900 Subject: [PATCH 6/9] minor changes to ci --- .ci/azure-pipelines.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 875c14c76..f11891b6a 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -15,9 +15,6 @@ jobs: - job: build displayName: 'Build' - pool: - vmImage: 'ubuntu-latest' - strategy: matrix: Development: @@ -27,6 +24,9 @@ jobs: Standalone: BuildConfiguration: standalone + pool: + vmImage: 'ubuntu-latest' + steps: - task: NodeTool@0 displayName: 'Install Node' @@ -61,11 +61,9 @@ jobs: - script: 'mv dist jellyfin-web' displayName: 'Rename Directory' - condition: succeeded() - task: PublishPipelineArtifact@1 displayName: 'Publish Release' - condition: succeeded() inputs: targetPath: '$(Build.SourcesDirectory)/jellyfin-web' artifactName: 'jellyfin-web-$(BuildConfiguration)' From 1ccae13c05e1da19cce28fef5d976f9fd725ff84 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 5 Apr 2020 04:16:56 +0900 Subject: [PATCH 7/9] title casing for job names --- .ci/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index f11891b6a..7928cb59e 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -12,7 +12,7 @@ pr: - '*' jobs: - - job: build + - job: Build displayName: 'Build' strategy: @@ -68,7 +68,7 @@ jobs: targetPath: '$(Build.SourcesDirectory)/jellyfin-web' artifactName: 'jellyfin-web-$(BuildConfiguration)' - - job: lint + - job: Lint displayName: 'Lint' pool: From 4fe7f0db97fde6dd9501461c77a495bff72965f4 Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 6 Apr 2020 19:20:33 +0900 Subject: [PATCH 8/9] add code suggestions Co-Authored-By: Dmitry Lyzo <56478732+dmitrylyzo@users.noreply.github.com> --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 6ed1877aa..fe84f7693 100644 --- a/package.json +++ b/package.json @@ -91,11 +91,10 @@ "src/components/input/keyboardnavigation.js", "src/components/scrollManager.js", "src/components/sanatizefilename.js", - "src/components/scrollManager.js", "src/scripts/settings/webSettings.js", "src/scripts/settings/appSettings.js", "src/scripts/settings/userSettings.js", - "src/scripts/imagehelper.js" + "src/scripts/imagehelper.js", "src/scripts/dfnshelper.js" ], "plugins": [ From fae913c221ee1ed7211ffb55ab6fbdd4299c5440 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 9 Apr 2020 00:36:44 +0900 Subject: [PATCH 9/9] fix new linting rules --- src/scripts/imagehelper.js | 10 ++++++---- src/scripts/settings/appSettings.js | 30 +++++++++++++++------------- src/scripts/settings/userSettings.js | 2 ++ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/scripts/imagehelper.js b/src/scripts/imagehelper.js index 21f987e62..790862b22 100644 --- a/src/scripts/imagehelper.js +++ b/src/scripts/imagehelper.js @@ -72,7 +72,9 @@ import browser from 'browser'; } } - export default { - getDeviceIcon: getDeviceIcon, - getLibraryIcon: getLibraryIcon - } +/* eslint-enable indent */ + +export default { + getDeviceIcon: getDeviceIcon, + getLibraryIcon: getLibraryIcon +}; diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js index 3b65495a1..03ceb346a 100644 --- a/src/scripts/settings/appSettings.js +++ b/src/scripts/settings/appSettings.js @@ -130,17 +130,19 @@ import events from 'events'; return appStorage.getItem(getKey(name, userId)); } - export default { - enableAutoLogin: enableAutoLogin, - enableSystemExternalPlayers: enableSystemExternalPlayers, - enableAutomaticBitrateDetection: enableAutomaticBitrateDetection, - maxStreamingBitrate: maxStreamingBitrate, - maxStaticMusicBitrate: maxStaticMusicBitrate, - maxChromecastBitrate: maxChromecastBitrate, - syncOnlyOnWifi: syncOnlyOnWifi, - syncPath: syncPath, - cameraUploadServers: cameraUploadServers, - runAtStartup: runAtStartup, - set: set, - get: get - } +/* eslint-enable indent */ + +export default { + enableAutoLogin: enableAutoLogin, + enableSystemExternalPlayers: enableSystemExternalPlayers, + enableAutomaticBitrateDetection: enableAutomaticBitrateDetection, + maxStreamingBitrate: maxStreamingBitrate, + maxStaticMusicBitrate: maxStaticMusicBitrate, + maxChromecastBitrate: maxChromecastBitrate, + syncOnlyOnWifi: syncOnlyOnWifi, + syncPath: syncPath, + cameraUploadServers: cameraUploadServers, + runAtStartup: runAtStartup, + set: set, + get: get +}; diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js index d2cc131c6..9f9606dfb 100644 --- a/src/scripts/settings/userSettings.js +++ b/src/scripts/settings/userSettings.js @@ -249,3 +249,5 @@ import events from 'events'; export function getFilter(key) { return this.get(key, true); } + +/* eslint-enable indent */