milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode

Browse source 
# Conflicts:
#	src/components/guide/guide.js
#	src/components/mediainfo/mediainfo.js
#	src/components/multiselect/multiselect.js
#	src/components/playback/brightnessosd.js
#	src/components/recordingcreator/recordingbutton.js
#	src/components/userdatabuttons/emby-ratingbutton.js
#	src/controllers/favorites.js
This commit is contained in:
grafixeyehero 2019-11-24 17:45:48 +03:00
commit 080b3365d6
145 changed files with 1438 additions and 4767 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/scripts/browser.js
View file

@ -30,7 +30,6 @@ define([], function () {
}
function isMobile(userAgent) {
var terms = [
'mobi',
'ipad',
@ -144,14 +143,16 @@ define([], function () {
}
}
var animation = false,
animationstring = 'animation',
keyframeprefix = '',
domPrefixes = ['Webkit', 'O', 'Moz'],
pfx = '',
elm = document.createElement('div');
var animation = false;
var animationstring = 'animation';
var keyframeprefix = '';
var domPrefixes = ['Webkit', 'O', 'Moz'];
var pfx = '';
var elm = document.createElement('div');
if (elm.style.animationName !== undefined) { animation = true; }
if (elm.style.animationName !== undefined) {
animation = true;
}
if (animation === false && allowPrefix) {
for (var i = 0; i < domPrefixes.length; i++) {
@ -204,8 +205,7 @@ define([], function () {
// http://www.neowin.net/news/ie11-fakes-user-agent-to-fool-gmail-in-windows-phone-81-gdr1-update
browser = "msie";
}
else if (ua.indexOf("like gecko") !== -1 && ua.indexOf('webkit') === -1 && ua.indexOf('opera') === -1 && ua.indexOf('chrome') === -1 && ua.indexOf('safari') === -1) {
} else if (ua.indexOf("like gecko") !== -1 && ua.indexOf('webkit') === -1 && ua.indexOf('opera') === -1 && ua.indexOf('chrome') === -1 && ua.indexOf('safari') === -1) {
browser = "msie";
}
}

16
src/scripts/browserdeviceprofile.js
View file

@ -88,18 +88,14 @@ define(['browser'], function (browser) {
if (browser.edgeUwp) {
return true;
}
}
else if (format === 'wma') {
} else if (format === 'wma') {
if (browser.tizen || browser.orsay) {
return true;
}
if (browser.edgeUwp) {
return true;
}
}
else if (format === 'opus') {
} else if (format === 'opus') {
typeString = 'audio/ogg; codecs="opus"';
if (document.createElement('audio').canPlayType(typeString).replace(/no/, '')) {
@ -107,9 +103,7 @@ define(['browser'], function (browser) {
}
return false;
}
else if (format === 'mp2') {
} else if (format === 'mp2') {
// For now
return false;
@ -575,9 +569,7 @@ define(['browser'], function (browser) {
Type: 'Audio',
AudioCodec: audioFormat
});
}
else if (audioFormat === 'mp3') {
} else if (audioFormat === 'mp3') {
profile.DirectPlayProfiles.push({
Container: audioFormat,

41
src/scripts/editorsidebar.js
View file

@ -2,19 +2,19 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
"use strict";
function getNode(item, folderState, selected) {
var htmlName = getNodeInnerHtml(item),
node = {
id: item.Id,
text: htmlName,
state: {
opened: item.IsFolder && folderState == "open",
selected: selected
},
li_attr: {
serveritemtype: item.Type,
collectiontype: item.CollectionType
}
};
var htmlName = getNodeInnerHtml(item);
var node = {
id: item.Id,
text: htmlName,
state: {
opened: item.IsFolder && folderState == "open",
selected: selected
},
li_attr: {
serveritemtype: item.Type,
collectiontype: item.CollectionType
}
};
if (item.IsFolder) {
node.children = [{
text: "Loading...",
@ -44,20 +44,15 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
var htmlName = "<div class='editorNode'>";
if (item.IsFolder) {
htmlName += '<i class="md-icon metadataSidebarIcon">folder</i>';
}
else if (item.MediaType === "Video") {
} else if (item.MediaType === "Video") {
htmlName += '<i class="md-icon metadataSidebarIcon">movie</i>';
}
else if (item.MediaType === "Audio") {
} else if (item.MediaType === "Audio") {
htmlName += '<i class="md-icon metadataSidebarIcon">audiotrack</i>';
}
else if (item.Type === "TvChannel") {
} else if (item.Type === "TvChannel") {
htmlName += '<i class="md-icon metadataSidebarIcon">live_tv</i>';
}
else if (item.MediaType === "Photo") {
} else if (item.MediaType === "Photo") {
htmlName += '<i class="md-icon metadataSidebarIcon">photo</i>';
}
else if (item.MediaType === "Book") {
} else if (item.MediaType === "Book") {
htmlName += '<i class="md-icon metadataSidebarIcon">book</i>';
}
if (item.LockData) {

3
src/scripts/librarybrowser.js
View file

@ -156,7 +156,8 @@ define(["userSettings"], function (userSettings) {
html += '<h2 style="margin:0 0 .5em;">';
html += Globalize.translate("HeaderSortBy");
html += "</h2>";
var i, length;
var i;
var length;
var isChecked;
html += '<div>';
for (i = 0, length = options.items.length; i < length; i++) {

6
src/scripts/librarymenu.js
View file

@ -25,11 +25,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
if (user && user.name) {
if (user.imageUrl) {
var url = user.imageUrl;
if (user.supportsImageParams) {
url += "&height=" + Math.round(26 * Math.max(window.devicePixelRatio || 1, 2));
}
updateHeaderUserButton(url);
hasImage = true;
}
@ -189,7 +184,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += "</div>";
}
// add buttons to navigation drawer
navDrawerScrollContainer.innerHTML = html;
// bind logout button click to method

2
src/scripts/routes.js
View file

@ -447,6 +447,6 @@ define([
defineRoute({
path: "/",
isDefaultRoute: true,
autoFocus: false,
autoFocus: false
});
});

25
src/scripts/site.js
View file

@ -308,7 +308,7 @@ var AppInfo = {};
}
function getBowerPath() {
return "bower_components";
return "libraries";
}
function getComponentsPath() {
@ -387,7 +387,7 @@ var AppInfo = {};
return self.ResizeObserver;
});
} else {
define("ResizeObserver", [getBowerPath() + "/resize-observer-polyfill/ResizeObserver"], returnFirstDependency);
define("ResizeObserver", ["resize-observer-polyfill"], returnFirstDependency);
}
}
@ -410,9 +410,9 @@ var AppInfo = {};
if ("registerElement" in document) {
define("registerElement", []);
} else if (browser.msie) {
define("registerElement", [bowerPath + "/webcomponentsjs/webcomponents-lite.min.js"], returnFirstDependency);
define("registerElement", ["webcomponents"], returnFirstDependency);
} else {
define("registerElement", [bowerPath + "/document-register-element/build/document-register-element"], returnFirstDependency);
define("registerElement", ["document-register-element"], returnFirstDependency);
}
define("imageFetcher", [componentsPath + "/images/imageFetcher"], returnFirstDependency);
@ -632,7 +632,7 @@ var AppInfo = {};
}
if (!window.Promise || browser.web0s) {
require([getBowerPath() + "/native-promise-only/lib/npo.src"], init);
require(["native-promise-only"], init);
} else {
init();
}
@ -681,15 +681,20 @@ var AppInfo = {};
},
bundles: {
bundle: [
"document-register-element",
"fetch",
"flvjs",
"jstree",
"jQuery",
"hlsjs",
"howler",
"native-promise-only",
"resize-observer-polyfill",
"shaka",
"swiper",
"sortable",
"libjass"
"libjass",
"webcomponents"
]
},
urlArgs: urlArgs,
@ -741,9 +746,10 @@ var AppInfo = {};
define("itemrepository", [bowerPath + "/apiclient/sync/itemrepository"], returnFirstDependency);
define("useractionrepository", [bowerPath + "/apiclient/sync/useractionrepository"], returnFirstDependency);
// also pull out these libs
define("page", [bowerPath + "/page"], returnFirstDependency);
define("fetch", [bowerPath + "/fetch/fetch"], returnFirstDependency);
// TODO remove these libraries
// all three have been modified so we need to fix that first
define("page", [bowerPath + "/pagejs/page"], returnFirstDependency);
define("scroller", [componentsPath + "/scroller"], returnFirstDependency);
define("queryString", [bowerPath + "/query-string/index"], function () {
return queryString;
});
@ -843,7 +849,6 @@ var AppInfo = {};
define("sortMenu", [componentsPath + "/sortmenu/sortmenu"], returnFirstDependency);
define("idb", [componentsPath + "/idb"], returnFirstDependency);
define("sanitizefilename", [componentsPath + "/sanitizefilename"], returnFirstDependency);
define("scroller", [componentsPath + "/scroller"], returnFirstDependency);
define("toast", [componentsPath + "/toast/toast"], returnFirstDependency);
define("scrollHelper", [componentsPath + "/scrollhelper"], returnFirstDependency);
define("touchHelper", [componentsPath + "/touchhelper"], returnFirstDependency);