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

2020-07-23 11:54:21 +09:00 · 2020-07-23 11:54:21 +09:00 · 20324144af
commit 20324144af
parent f5ce196e07 7a33e90693
32 changed files with 802 additions and 730 deletions
--- a/src/components/accessSchedule/accessSchedule.js
+++ b/src/components/accessSchedule/accessSchedule.js
@ -59,8 +59,7 @@ import 'formDialogStyle';

    export function show(options) {
        return new Promise((resolve, reject) => {
-            // TODO: remove require
-            require(['text!./components/accessSchedule/accessSchedule.template.html'], template => {
+            import('text!./components/accessSchedule/accessSchedule.template.html').then(({default: template}) => {
                const dlg = dialogHelper.createDialog({
                    removeOnClose: true,
                    size: 'small'