diff --git a/eslint.config.mjs b/eslint.config.mjs index cad8605d3d..2da755a5d7 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -215,8 +215,6 @@ export default tseslint.config( 'webapis': 'readonly', // WebOS globals 'webOS': 'readonly', - // Dependency globals - '$': 'readonly', // Jellyfin globals 'ApiClient': 'readonly', // Build time definitions diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js index 8536f93c1f..fa4e7963d2 100644 --- a/src/components/tvproviders/schedulesdirect.js +++ b/src/components/tvproviders/schedulesdirect.js @@ -1,4 +1,5 @@ -import 'jquery'; +import $ from 'jquery'; + import loading from '../loading/loading'; import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/tvproviders/xmltv.js b/src/components/tvproviders/xmltv.js index 437905460a..e81e558752 100644 --- a/src/components/tvproviders/xmltv.js +++ b/src/components/tvproviders/xmltv.js @@ -1,4 +1,5 @@ -import 'jquery'; +import $ from 'jquery'; + import loading from '../loading/loading'; import globalize from '../../lib/globalize'; import '../../elements/emby-checkbox/emby-checkbox'; diff --git a/src/components/viewContainer.js b/src/components/viewContainer.js index b5509f8b5a..b14394d431 100644 --- a/src/components/viewContainer.js +++ b/src/components/viewContainer.js @@ -1,6 +1,9 @@ +import $ from 'jquery'; import { importModule } from '@uupaa/dynamic-import-polyfill'; + +import Dashboard from 'utils/dashboard'; + import './viewManager/viewContainer.scss'; -import Dashboard from '../utils/dashboard'; const getMainAnimatedPages = () => { return document.querySelector('.mainAnimatedPages'); @@ -65,13 +68,13 @@ export function loadView(options) { } if (currentPage) { - if (newViewInfo.hasScript && window.$) { + if (newViewInfo.hasScript) { mainAnimatedPages.removeChild(currentPage); view = $(view).appendTo(mainAnimatedPages)[0]; } else { mainAnimatedPages.replaceChild(view, currentPage); } - } else if (newViewInfo.hasScript && window.$) { + } else if (newViewInfo.hasScript) { view = $(view).appendTo(mainAnimatedPages)[0]; } else { mainAnimatedPages.appendChild(view); @@ -109,11 +112,6 @@ export function loadView(options) { afterAnimate(allPages, pageIndex); } - if (window.$) { - $.mobile = $.mobile || {}; - $.mobile.activePage = view; - } - return view; }); } @@ -213,11 +211,6 @@ export function tryRestoreView(options) { afterAnimate(allPages, index); } - if (window.$) { - $.mobile = $.mobile || {}; - $.mobile.activePage = view; - } - return view; }); } diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js index 08982619a0..078e9c43c0 100644 --- a/src/scripts/editorsidebar.js +++ b/src/scripts/editorsidebar.js @@ -1,5 +1,5 @@ import escapeHtml from 'escape-html'; -import 'jquery'; +import $ from 'jquery'; import 'material-design-icons-iconfont'; import globalize from 'lib/globalize'; diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js index 830311e510..7e0f3a9455 100644 --- a/src/scripts/libraryBrowser.js +++ b/src/scripts/libraryBrowser.js @@ -1,3 +1,5 @@ +import $ from 'jquery'; + import globalize from 'lib/globalize'; export function showLayoutMenu (button, currentLayout, views) { @@ -30,7 +32,7 @@ export function showLayoutMenu (button, currentLayout, views) { cancelable: false })); - if (!dispatchEvent && window.$) { + if (!dispatchEvent) { $(button).trigger('layoutchange', [id]); } }