Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / ckeditor / js / views / ControllerView.es6.js

diff --git a/web/core/modules/ckeditor/js/views/ControllerView.es6.js b/web/core/modules/ckeditor/js/views/ControllerView.es6.js
index 869a004b960ce77b3581184114f94807ae3c634b..8eaeec04798453486533d1587a501d8742981db2 100644 (file)
--- a/web/core/modules/ckeditor/js/views/ControllerView.es6.js
+++ b/web/core/modules/ckeditor/js/views/ControllerView.es6.js
@@ -150,11 +150,9 @@
       const hiddenEditorConfig = this.model.get('hiddenEditorConfig');
       if (hiddenEditorConfig.drupalExternalPlugins) {
         const externalPlugins = hiddenEditorConfig.drupalExternalPlugins;
-        for (const pluginName in externalPlugins) {
-          if (externalPlugins.hasOwnProperty(pluginName)) {
-            CKEDITOR.plugins.addExternal(pluginName, externalPlugins[pluginName], '');
-          }
-        }
+        Object.keys(externalPlugins || {}).forEach((pluginName) => {
+          CKEDITOR.plugins.addExternal(pluginName, externalPlugins[pluginName], '');
+        });
       }
       CKEDITOR.inline($(`#${hiddenCKEditorID}`).get(0), CKEditorConfig);
 
@@ -181,17 +179,15 @@
           // @see getFeatureForButton()
           const features = {};
           const buttonsToFeatures = {};
-          for (const featureName in CKEFeatureRulesMap) {
-            if (CKEFeatureRulesMap.hasOwnProperty(featureName)) {
-              const feature = new Drupal.EditorFeature(featureName);
-              convertCKERulesToEditorFeature(feature, CKEFeatureRulesMap[featureName]);
-              features[featureName] = feature;
-              const command = e.editor.getCommand(featureName);
-              if (command) {
-                buttonsToFeatures[command.uiItems[0].name] = featureName;
-              }
+          Object.keys(CKEFeatureRulesMap).forEach((featureName) => {
+            const feature = new Drupal.EditorFeature(featureName);
+            convertCKERulesToEditorFeature(feature, CKEFeatureRulesMap[featureName]);
+            features[featureName] = feature;
+            const command = e.editor.getCommand(featureName);
+            if (command) {
+              buttonsToFeatures[command.uiItems[0].name] = featureName;
             }
-          }
+          });
 
           callback(features, buttonsToFeatures);
         }
@@ -326,25 +322,21 @@
         // changed, rebuild the CKEditor features metadata.
         .on('CKEditorPluginSettingsChanged.ckeditorAdmin', (event, settingsChanges) => {
           // Update hidden CKEditor configuration.
-          for (const key in settingsChanges) {
-            if (settingsChanges.hasOwnProperty(key)) {
-              hiddenEditorConfig[key] = settingsChanges[key];
-            }
-          }
+          Object.keys(settingsChanges || {}).forEach((key) => {
+            hiddenEditorConfig[key] = settingsChanges[key];
+          });
 
           // Retrieve features for the updated hidden CKEditor configuration.
           getCKEditorFeatures(hiddenEditorConfig, (features) => {
             // Trigger a standardized text editor configuration event for each
             // feature that was modified by the configuration changes.
             const featuresMetadata = view.model.get('featuresMetadata');
-            for (const name in features) {
-              if (features.hasOwnProperty(name)) {
-                const feature = features[name];
-                if (featuresMetadata.hasOwnProperty(name) && !_.isEqual(featuresMetadata[name], feature)) {
-                  Drupal.editorConfiguration.modifiedFeature(feature);
-                }
+            Object.keys(features || {}).forEach((name) => {
+              const feature = features[name];
+              if (featuresMetadata.hasOwnProperty(name) && !_.isEqual(featuresMetadata[name], feature)) {
+                Drupal.editorConfiguration.modifiedFeature(feature);
               }
-            }
+            });
             // Update the CKEditor features metadata.
             view.model.set('featuresMetadata', features);
           });