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

2020-07-19 20:11:53 +01:00
parent f084f36757 ac5ec585f3
commit 75076fd172
48 changed files with 1237 additions and 1038 deletions
@@ -1,8 +1,10 @@
-define(['components/activitylog', 'globalize'], function (ActivityLog, globalize) {
-    'use strict';
+import ActivityLog from 'components/activitylog';
+import globalize from 'globalize';

-    return function (view, params) {
-        var activityLog;
+/* eslint-disable indent */
+
+    export default function (view, params) {
+        let activityLog;

        if (params.useractivity !== 'false') {
            view.querySelector('.activityItems').setAttribute('data-useractivity', 'true');
@@ -27,5 +29,6 @@ define(['components/activitylog', 'globalize'], function (ActivityLog, globalize

            activityLog = null;
        });
-    };
-});
+    }
+
+/* eslint-enable indent */