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
@@ -187,7 +187,7 @@ var Dashboard = {
        }

        require(['alert'], function (alert) {
-            alert({
+            alert.default({
                title: options.title || Globalize.translate('HeaderAlert'),
                text: options.message
            }).then(options.callback || function () {});