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

update requirecss

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-01 00:22:52 -05:00
parent 57708e9007
commit 91051df493
30 changed files with 600 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/components/directorybrowser/directorybrowser.js
View file

@ -48,12 +48,12 @@
}
if (!parentPathPromise) {
parentPathPromise = $.Deferred();
parentPathPromise.resolveWith(null, []);
parentPathPromise = parentPathPromise.promise();
parentPathPromise = new Promise(function (resolve, reject) {
resolve();
});
}
Promise.all(promise, parentPathPromise).then(function (responses) {
Promise.all([promise, parentPathPromise]).then(function (responses) {
var folders = responses[0];
var parentPath = responses[1] || '';

2
dashboard-ui/components/requirecss.js
View file

@ -26,7 +26,7 @@ define(function () {
requireCss.load = function (cssId, req, load, config) {
// Somehow if the url starts with /css, require will get all screwed up since this extension is also called css
cssId = cssId.replace('js/requirecss', 'css');
cssId = cssId.replace('components/requirecss', 'css');
var url = cssId + '.css';
var packageName = '';