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

merge branch master into remove-prefixes

This commit is contained in:
dkanada 2020-01-06 21:22:49 +09:00
commit 34b155cbae
75 changed files with 3529 additions and 532 deletions

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

View file

@ -6,14 +6,11 @@ define(['require', 'css!./loadingLegacy'], function (require) {
return {
show: function () {
var elem = loadingElem;
if (!elem) {
elem = document.createElement("img");
elem.src = require.toUrl('.').split('?')[0] + '/loader2.gif';
elem.src = require.toUrl('.').split('?')[0] + '/loader.gif';
loadingElem = elem;
elem.classList.add('loading-spinner');
document.body.appendChild(elem);
@ -23,11 +20,9 @@ define(['require', 'css!./loadingLegacy'], function (require) {
},
hide: function () {
var elem = loadingElem;
if (elem) {
elem.classList.add('hide');
}
}
};
});
});

View file

@ -1,3 +0,0 @@
{
"main": "loading.js"
}