Remove getWindowLocationSearch global and duplicate implementation

.eslintrc.js

@@ -194,7 +194,6 @@ module.exports = {
                 'DashboardPage': 'writable',
                 'Emby': 'readonly',
                 'getParameterByName': 'writable',
-                'getWindowLocationSearch': 'writable',
                 'Globalize': 'writable',
                 'Hls': 'writable',
                 'dfnshelper': 'writable',

src/components/appRouter.js

@@ -12,6 +12,7 @@ import Dashboard from '../scripts/clientUtils';
 import ServerConnections from './ServerConnections';
 import alert from './alert';
 import reactControllerFactory from './reactControllerFactory';
+import { getWindowLocationSearch } from '../utils/url.ts';
 
 class AppRouter {
     allRoutes = [];
@@ -678,19 +679,6 @@ class AppRouter {
         };
     }
 
-    getWindowLocationSearch() {
-        const currentPath = this.currentRouteInfo ? (this.currentRouteInfo.path || '') : '';
-
-        const index = currentPath.indexOf('?');
-        let search = '';
-
-        if (index !== -1) {
-            search = currentPath.substring(index);
-        }
-
-        return search || '';
-    }
-
     showGuide() {
         Dashboard.navigate('livetv.html?tab=1');
     }

src/scripts/clientUtils.js

@@ -10,6 +10,7 @@ import datetime from '../scripts/datetime';
 import DirectoryBrowser from '../components/directorybrowser/directorybrowser';
 import dialogHelper from '../components/dialogHelper/dialogHelper';
 import itemIdentifier from '../components/itemidentifier/itemidentifier';
+import { getWindowLocationSearch } from '../utils/url.ts';
 
 export function getCurrentUser() {
     return window.ApiClient.getCurrentUser(false);

src/scripts/site.js

@@ -26,6 +26,7 @@ import './routes';
 import '../components/themeMediaPlayer';
 import './autoBackdrops';
 import { pageClassOn, serverAddress } from './clientUtils';
+import { getWindowLocationSearch } from '../utils/url.ts';
 import './screensavermanager';
 import './serverNotifications';
 import '../components/playback/playerSelectionMenu';
@@ -41,21 +42,6 @@ import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudio
 import { currentSettings } from './settings/userSettings';
 import taskButton from './taskbutton';
 
-// TODO: Move this elsewhere
-window.getWindowLocationSearch = function(win) {
-    let search = (win || window).location.search;
-
-    if (!search) {
-        const index = window.location.href.indexOf('?');
-
-        if (index != -1) {
-            search = window.location.href.substring(index);
-        }
-    }
-
-    return search || '';
-};
-
 // TODO: Move this elsewhere
 window.getParameterByName = function(name, url) {
     name = name.replace(/[[]/, '\\[').replace(/[\]]/, '\\]');

src/utils/url.ts

@@ -0,0 +1,13 @@
+export const getWindowLocationSearch = (win: Window | null | undefined) => {
+    let search = (win || window).location.search;
+
+    if (!search) {
+        const index = window.location.href.indexOf('?');
+
+        if (index != -1) {
+            search = window.location.href.substring(index);
+        }
+    }
+
+    return search || '';
+};