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

Merge pull request #205 from dkanada/eslint

Browse source 
Move assets and third party libs out of components and update some strings
This commit is contained in:
Joshua M. Boniface 2019-03-27 16:28:48 -04:00 • committed by GitHub
commit 535f3dbbad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 101 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/librarymenu.js
View file

@ -440,7 +440,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
var html = "";
html += '<a class="adminDrawerLogo clearLink" is="emby-linkbutton" href="home.html" style="text-align:left;">';
html += '<img src="css/images/logoblack.png" />';
html += '<img src="img/logoblack.png" />';
html += "</a>";
html += toolsMenuHtml;
navDrawerScrollContainer.innerHTML = html;

32
src/scripts/site.js
View file

@ -316,20 +316,6 @@ var AppInfo = {};
}
function getSettingsBuilder(UserSettings, layoutManager, browser) {
UserSettings.prototype.enableThemeVideos = function (val) {
if (val != null) {
return this.set('enableThemeVideos', val.toString(), false);
}
val = this.get('enableThemeVideos', false);
if (val !== 'false') {
return !layoutManager.mobile;
} else {
return !browser.slow;
}
};
return UserSettings;
}
@ -410,7 +396,7 @@ var AppInfo = {};
return self.ResizeObserver;
});
} else {
define("ResizeObserver", ["components/resize-observer-polyfill/ResizeObserver"], returnFirstDependency);
define("ResizeObserver", ["thirdparty/resize-observer-polyfill/ResizeObserver"], returnFirstDependency);
}
}
@ -600,7 +586,7 @@ var AppInfo = {};
} else {
if (browser.iOS) {
require(['css!devices/ios/ios.css']);
require(['css!css/ios.css']);
}
window.Emby.Page = appRouter;
@ -686,7 +672,7 @@ var AppInfo = {};
}
if (!window.Promise || browser.web0s) {
require(["components/native-promise-only/lib/npo.src"], init);
require(["thirdparty/native-promise-only/lib/npo.src"], init);
} else {
init();
}
@ -724,7 +710,7 @@ var AppInfo = {};
inputManager: componentsPath + "/inputmanager",
qualityoptions: componentsPath + "/qualityoptions",
hammer: bowerPath + "/hammerjs/hammer.min",
pageJs: componentsPath + "/pagejs/page",
pageJs: "thirdparty/pagejs/page",
focusManager: componentsPath + "/focusmanager",
datetime: componentsPath + "/datetime",
globalize: componentsPath + "/globalize",
@ -737,8 +723,8 @@ var AppInfo = {};
packageManager: componentsPath + "/packagemanager"
};
paths.hlsjs = bowerPath + "/hlsjs/dist/hls.min";
paths.flvjs = componentsPath + "/flvjs/flv.min";
paths.shaka = componentsPath + "/shaka/shaka-player.compiled";
paths.flvjs = "thirdparty/flvjs/flv.min";
paths.shaka = "thirdparty/shaka/shaka-player.compiled";
define("chromecastHelper", [componentsPath + "/chromecast/chromecasthelpers"], returnFirstDependency);
define("mediaSession", [componentsPath + "/playback/mediasession"], returnFirstDependency);
define("actionsheet", [componentsPath + "/actionsheet/actionsheet"], returnFirstDependency);
@ -877,9 +863,9 @@ var AppInfo = {};
define("appSettings", [componentsPath + "/appsettings"], returnFirstDependency);
define("userSettings", [componentsPath + "/usersettings/usersettings"], returnFirstDependency);
define("userSettingsBuilder", [componentsPath + "/usersettings/usersettingsbuilder", "layoutManager", "browser"], getSettingsBuilder);
define("material-icons", ["css!" + componentsPath + "/fonts/material-icons/style"], returnFirstDependency);
define("systemFontsCss", ["css!" + componentsPath + "/fonts/fonts"], returnFirstDependency);
define("systemFontsSizedCss", ["css!" + componentsPath + "/fonts/fonts.sized"], returnFirstDependency);
define("material-icons", ["css!css/material-icons/style"], returnFirstDependency);
define("systemFontsCss", ["css!css/fonts"], returnFirstDependency);
define("systemFontsSizedCss", ["css!css/fonts.sized"], returnFirstDependency);
define("scrollStyles", ["css!" + componentsPath + "/scrollstyles"], returnFirstDependency);
define("imageUploader", [componentsPath + "/imageuploader/imageuploader"], returnFirstDependency);
define("navdrawer", ["components/navdrawer/navdrawer"], returnFirstDependency);