From 680e56277904c184a65b74087b25598a1ca62dca Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 6 Jun 2020 17:04:16 +0900 Subject: [PATCH 1/4] add support for es6 controllers and migrate logs controller --- package.json | 1 + src/components/viewManager/viewManager.js | 4 ++-- src/controllers/dashboard/logs.js | 18 +++++++++++++----- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 785878d20b..aa0f20790a 100644 --- a/package.json +++ b/package.json @@ -104,6 +104,7 @@ "src/components/syncplay/playbackPermissionManager.js", "src/components/syncplay/syncPlayManager.js", "src/components/syncplay/timeSyncManager.js", + "src/controllers/dashboard/logs.js", "src/plugins/bookPlayer/plugin.js", "src/plugins/bookPlayer/tableOfContent.js", "src/plugins/photoPlayer/plugin.js", diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js index a8e514e06e..4ceb3b9491 100644 --- a/src/components/viewManager/viewManager.js +++ b/src/components/viewManager/viewManager.js @@ -22,9 +22,9 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi newView.initComplete = true; if (typeof options.controllerFactory === 'function') { - - // Use controller method var controller = new options.controllerFactory(newView, eventDetail.detail.params); + } else if (options.controllerFactory.default && typeof options.controllerFactory.default === 'function') { + var controller = new options.controllerFactory.default(newView, eventDetail.detail.params); } if (!options.controllerFactory || dispatchPageEvents) { diff --git a/src/controllers/dashboard/logs.js b/src/controllers/dashboard/logs.js index e0b000a130..bdb9e2537f 100644 --- a/src/controllers/dashboard/logs.js +++ b/src/controllers/dashboard/logs.js @@ -1,6 +1,13 @@ -define(['datetime', 'loading', 'apphost', 'listViewStyle', 'emby-button', 'flexStyles'], function(datetime, loading, appHost) { - 'use strict'; - return function(view, params) { +import datetime from 'datetime'; +import loading from 'loading'; +import appHost from 'apphost'; +import 'emby-button'; +import 'listViewStyle'; +import 'flexStyles'; + +/* eslint-disable indent */ + + export default function(view, params) { view.addEventListener('viewbeforeshow', function() { loading.show(); var apiClient = ApiClient; @@ -29,5 +36,6 @@ define(['datetime', 'loading', 'apphost', 'listViewStyle', 'emby-button', 'flexS loading.hide(); }); }); - }; -}); + } + +/* eslint-enable indent */ From 523f060e9924680773f9392ef8da19ac601de738 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 6 Jun 2020 18:34:45 +0900 Subject: [PATCH 2/4] fix issue with certain controllers during page load --- src/components/viewManager/viewManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js index 4ceb3b9491..e37c871232 100644 --- a/src/components/viewManager/viewManager.js +++ b/src/components/viewManager/viewManager.js @@ -23,7 +23,7 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi if (typeof options.controllerFactory === 'function') { var controller = new options.controllerFactory(newView, eventDetail.detail.params); - } else if (options.controllerFactory.default && typeof options.controllerFactory.default === 'function') { + } else if (options.controllerFactory && typeof options.controllerFactory.default === 'function') { var controller = new options.controllerFactory.default(newView, eventDetail.detail.params); } From 0d12a033a60699aab1697e7a07ca24d4b5ebeb5c Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 10 Jun 2020 03:04:58 +0900 Subject: [PATCH 3/4] fix error message from book player --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa0f20790a..3255159ec4 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "src/components/syncplay/timeSyncManager.js", "src/controllers/dashboard/logs.js", "src/plugins/bookPlayer/plugin.js", - "src/plugins/bookPlayer/tableOfContent.js", + "src/plugins/bookPlayer/tableOfContents.js", "src/plugins/photoPlayer/plugin.js", "src/scripts/deleteHelper.js", "src/scripts/dfnshelper.js", From daece8a4d9ae4cbf9bef0520ef59a5e0ddd8e9f2 Mon Sep 17 00:00:00 2001 From: dkanada Date: Wed, 10 Jun 2020 13:56:55 +0900 Subject: [PATCH 4/4] add code suggestions --- src/components/viewManager/viewManager.js | 5 +++-- src/controllers/dashboard/logs.js | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js index e37c871232..8e17264f9f 100644 --- a/src/components/viewManager/viewManager.js +++ b/src/components/viewManager/viewManager.js @@ -21,10 +21,11 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi if (!newView.initComplete) { newView.initComplete = true; + var controller; if (typeof options.controllerFactory === 'function') { - var controller = new options.controllerFactory(newView, eventDetail.detail.params); + controller = new options.controllerFactory(newView, eventDetail.detail.params); } else if (options.controllerFactory && typeof options.controllerFactory.default === 'function') { - var controller = new options.controllerFactory.default(newView, eventDetail.detail.params); + controller = new options.controllerFactory.default(newView, eventDetail.detail.params); } if (!options.controllerFactory || dispatchPageEvents) { diff --git a/src/controllers/dashboard/logs.js b/src/controllers/dashboard/logs.js index bdb9e2537f..7bf2785d50 100644 --- a/src/controllers/dashboard/logs.js +++ b/src/controllers/dashboard/logs.js @@ -1,6 +1,5 @@ import datetime from 'datetime'; import loading from 'loading'; -import appHost from 'apphost'; import 'emby-button'; import 'listViewStyle'; import 'flexStyles';