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
@@ -69,7 +69,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',

        require(['confirm'], function (confirm) {

-            confirm({
+            confirm.default({

                title: globalize.translate('ConfirmDeletion'),
                text: msg,