1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Simplify url utils

This commit is contained in:
Bill Thornton 2022-04-06 17:31:54 -04:00
parent 67169e2a6a
commit 3412201532
5 changed files with 8 additions and 30 deletions

View file

@ -10,7 +10,6 @@ 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);
@ -113,7 +112,7 @@ export function navigate(url, preserveQueryString) {
throw new Error('url cannot be null or empty');
}
const queryString = getWindowLocationSearch();
const queryString = window.location.search;
if (preserveQueryString && queryString) {
url += queryString;

View file

@ -300,9 +300,9 @@ import { getParameterByName } from '../utils/url.ts';
if (itemId) {
return itemId;
}
const url = window.location.hash || window.location.href;
return getParameterByName('id', url);
return getParameterByName('id');
}
let nodesToLoad = [];
let selectedNodeId;
$(document).on('itemsaved', '.metadataEditorPage', function (e, item) {

View file

@ -41,8 +41,6 @@ import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudio
import { currentSettings } from './settings/userSettings';
import taskButton from './taskbutton';
// TODO: Move this elsewhere
function loadCoreDictionary() {
const languages = ['af', 'ar', 'be-by', 'bg-bg', 'bn_bd', 'ca', 'cs', 'da', 'de', 'el', 'en-gb', 'en-us', 'eo', 'es', 'es-419', 'es-ar', 'es_do', 'es-mx', 'fa', 'fi', 'fil', 'fr', 'fr-ca', 'gl', 'gsw', 'he', 'hi-in', 'hr', 'hu', 'id', 'it', 'ja', 'kk', 'ko', 'lt-lt', 'mr', 'ms', 'nb', 'nl', 'pl', 'pr', 'pt', 'pt-br', 'pt-pt', 'ro', 'ru', 'sk', 'sl-si', 'sq', 'sv', 'ta', 'th', 'tr', 'uk', 'ur_pk', 'vi', 'zh-cn', 'zh-hk', 'zh-tw'];
const translations = languages.map(function (language) {