Merge branch 'master' into migrate-to-ES6-52

2020-08-02 17:45:27 +01:00
parent b082613ed9 ab9398344f
commit ee23096fed
169 changed files with 5347 additions and 5537 deletions
@@ -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 */