diff --git a/.eslintrc.js b/.eslintrc.js index 3051ae4f77b..21ae7e28e4a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -249,7 +249,6 @@ module.exports = { 'Emby': 'readonly', 'Hls': 'writable', 'LibraryMenu': 'writable', - 'MetadataEditor': 'writable', 'Windows': 'readonly', // Build time definitions __COMMIT_SHA__: 'readonly', diff --git a/src/controllers/edititemmetadata.js b/src/controllers/edititemmetadata.js index a5ac202cc7f..5502772db95 100644 --- a/src/controllers/edititemmetadata.js +++ b/src/controllers/edititemmetadata.js @@ -1,5 +1,5 @@ -import loading from '../components/loading/loading'; -import '../scripts/editorsidebar'; +import loading from 'components/loading/loading'; +import { getCurrentItemId, setCurrentItemId } from 'scripts/editorsidebar'; function reload(context, itemId) { loading.show(); @@ -16,14 +16,16 @@ function reload(context, itemId) { export default function (view) { view.addEventListener('viewshow', function () { - reload(this, MetadataEditor.getCurrentItemId()); + reload(this, getCurrentItemId()); }); - MetadataEditor.setCurrentItemId(null); + + setCurrentItemId(null); + view.querySelector('.libraryTree').addEventListener('itemclicked', function (event) { const data = event.detail; - if (data.id != MetadataEditor.getCurrentItemId()) { - MetadataEditor.setCurrentItemId(data.id); + if (data.id != getCurrentItemId()) { + setCurrentItemId(data.id); reload(view, data.id); } }); diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js index 37094e5d037..0074d34260e 100644 --- a/src/scripts/editorsidebar.js +++ b/src/scripts/editorsidebar.js @@ -287,11 +287,12 @@ function updateEditorNode(page, item) { } } -function setCurrentItemId(id) { +let itemId; +export function setCurrentItemId(id) { itemId = id; } -function getCurrentItemId() { +export function getCurrentItemId() { if (itemId) { return itemId; } @@ -326,16 +327,4 @@ $(document).on('itemsaved', '.metadataEditorPage', function (e, item) { .off('open_node.jstree', onNodeOpen) .off('load_node.jstree', onNodeOpen); }); -let itemId; -window.MetadataEditor = { - getItemPromise: function () { - const currentItemId = getCurrentItemId(); - if (currentItemId) { - return ApiClient.getItem(Dashboard.getCurrentUserId(), currentItemId); - } - return ApiClient.getRootFolder(Dashboard.getCurrentUserId()); - }, - getCurrentItemId: getCurrentItemId, - setCurrentItemId: setCurrentItemId -}; /* eslint-enable @typescript-eslint/naming-convention */