mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
ab0941be90
21 changed files with 127 additions and 101 deletions
|
@ -220,11 +220,31 @@ function humane_elapsed(firstDateStr, secondDateStr) {
|
|||
|
||||
}
|
||||
|
||||
function getWindowUrl(win) {
|
||||
return (win || window).location.href;
|
||||
}
|
||||
|
||||
function getWindowLocationSearch(win) {
|
||||
|
||||
var search = (win || window).location.search;
|
||||
|
||||
if (!search) {
|
||||
|
||||
var index = window.location.href.indexOf('?');
|
||||
if (index != -1) {
|
||||
search = window.location.href.substring(index);
|
||||
}
|
||||
}
|
||||
|
||||
return search || '';
|
||||
}
|
||||
|
||||
function getParameterByName(name, url) {
|
||||
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
|
||||
var regexS = "[\\?&]" + name + "=([^&#]*)";
|
||||
var regex = new RegExp(regexS, "i");
|
||||
var results = regex.exec(url || window.location.search);
|
||||
|
||||
var results = regex.exec(url || getWindowLocationSearch());
|
||||
if (results == null)
|
||||
return "";
|
||||
else
|
||||
|
|
|
@ -87,7 +87,7 @@
|
|||
$('#playButtonContainer', page).hide();
|
||||
}
|
||||
|
||||
var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + window.location.search : null;
|
||||
var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + getWindowLocationSearch() : null;
|
||||
$('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref));
|
||||
|
||||
if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") {
|
||||
|
@ -524,7 +524,7 @@
|
|||
|
||||
reload(page);
|
||||
|
||||
$('#btnEdit', page).attr('href', 'edititemmetadata.html' + window.location.search);
|
||||
$('#btnEdit', page).attr('href', 'edititemmetadata.html' + getWindowLocationSearch());
|
||||
|
||||
}).on('pagehide', "#itemByNameDetailPage", function () {
|
||||
|
||||
|
|
|
@ -649,7 +649,7 @@
|
|||
}
|
||||
|
||||
// Just use the first audio stream
|
||||
return audioStreams[0];
|
||||
return audioStreams[0].Index;
|
||||
}
|
||||
|
||||
function getVideoQualityOptions(mediaStreams) {
|
||||
|
|
|
@ -344,7 +344,7 @@ var Dashboard = {
|
|||
|
||||
navigate: function (url, preserveQueryString) {
|
||||
|
||||
var queryString = window.location.search;
|
||||
var queryString = getWindowLocationSearch();
|
||||
if (preserveQueryString && queryString) {
|
||||
url += queryString;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue