Merge branch 'es6' into migrate-to-ES6-36

2020-07-21 14:53:09 +01:00
parent 28bf9c3e6f e94c625778
commit f5ce196e07
76 changed files with 2070 additions and 1607 deletions
@@ -53,7 +53,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
                break;
            case 'ServerUpdateNeeded':
                require(['alert'], function (alert) {
-                    alert({
+                    alert.default({
                        text: globalize.translate('ServerUpdateNeeded', 'https://github.com/jellyfin/jellyfin'),
                        html: globalize.translate('ServerUpdateNeeded', '<a href="https://github.com/jellyfin/jellyfin">https://github.com/jellyfin/jellyfin</a>')
                    }).then(function () {