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 migrate-to-ES6-52

This commit is contained in:
Cameron 2020-08-02 17:45:27 +01:00 committed by GitHub
commit ee23096fed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
169 changed files with 5347 additions and 5537 deletions

View file

@ -2,6 +2,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
'use strict';
viewManager = viewManager.default || viewManager;
browser = browser.default || browser;
loading = loading.default || loading;
var appRouter = {
showLocalLogin: function (serverId, manualLogin) {
@ -233,8 +235,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
max /= 8;
max *= 1000000;
max *= 0.7;
max = parseInt(max);
return max;
return parseInt(max, 10);
}
}
/* eslint-enable compat/compat */