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

2020-07-31 09:52:21 +01:00
parent e445341405 b1e116885a
commit df162f3ca3
31 changed files with 1794 additions and 1307 deletions
@@ -231,8 +231,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 */