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

[yaffs-website] / web / core / modules / filter / filter.filter_html.admin.js

diff --git a/web/core/modules/filter/filter.filter_html.admin.js b/web/core/modules/filter/filter.filter_html.admin.js
index 773f35a9d8405442fdeb2ccb2eb6e9486d9b4e2a..5f4c6ef9fad351c9f98aa9d617b364c96f368e75 100644 (file)
--- a/web/core/modules/filter/filter.filter_html.admin.js
+++ b/web/core/modules/filter/filter.filter_html.admin.js
@@ -74,39 +74,36 @@
         }
     },
     _calculateAutoAllowedTags: function _calculateAutoAllowedTags(userAllowedTags, newFeatures) {
-      var featureName = void 0;
-      var feature = void 0;
-      var featureRule = void 0;
-      var filterRule = void 0;
-      var tag = void 0;
       var editorRequiredTags = {};
 
-      for (featureName in newFeatures) {
-        if (newFeatures.hasOwnProperty(featureName)) {
-          feature = newFeatures[featureName];
-          for (var f = 0; f < feature.length; f++) {
-            featureRule = feature[f];
-            for (var t = 0; t < featureRule.required.tags.length; t++) {
-              tag = featureRule.required.tags[t];
-              if (!_.has(editorRequiredTags, tag)) {
-                filterRule = new Drupal.FilterHTMLRule();
-                filterRule.restrictedTags.tags = [tag];
-
-                filterRule.restrictedTags.allowed.attributes = featureRule.required.attributes.slice(0);
-                filterRule.restrictedTags.allowed.classes = featureRule.required.classes.slice(0);
-                editorRequiredTags[tag] = filterRule;
-              } else {
-                  filterRule = editorRequiredTags[tag];
-                  filterRule.restrictedTags.allowed.attributes = _.union(filterRule.restrictedTags.allowed.attributes, featureRule.required.attributes);
-                  filterRule.restrictedTags.allowed.classes = _.union(filterRule.restrictedTags.allowed.classes, featureRule.required.classes);
-                }
-            }
+      Object.keys(newFeatures || {}).forEach(function (featureName) {
+        var feature = newFeatures[featureName];
+        var featureRule = void 0;
+        var filterRule = void 0;
+        var tag = void 0;
+
+        for (var f = 0; f < feature.length; f++) {
+          featureRule = feature[f];
+          for (var t = 0; t < featureRule.required.tags.length; t++) {
+            tag = featureRule.required.tags[t];
+            if (!_.has(editorRequiredTags, tag)) {
+              filterRule = new Drupal.FilterHTMLRule();
+              filterRule.restrictedTags.tags = [tag];
+
+              filterRule.restrictedTags.allowed.attributes = featureRule.required.attributes.slice(0);
+              filterRule.restrictedTags.allowed.classes = featureRule.required.classes.slice(0);
+              editorRequiredTags[tag] = filterRule;
+            } else {
+                filterRule = editorRequiredTags[tag];
+                filterRule.restrictedTags.allowed.attributes = _.union(filterRule.restrictedTags.allowed.attributes, featureRule.required.attributes);
+                filterRule.restrictedTags.allowed.classes = _.union(filterRule.restrictedTags.allowed.classes, featureRule.required.classes);
+              }
           }
         }
-      }
+      });
 
       var autoAllowedTags = {};
-      for (tag in editorRequiredTags) {
+      Object.keys(editorRequiredTags).forEach(function (tag) {
         if (!_.has(userAllowedTags, tag)) {
           autoAllowedTags[tag] = editorRequiredTags[tag];
         } else {
@@ -126,7 +123,7 @@
               autoAllowedTags[tag].restrictedTags.allowed.classes = _.union(allowedClasses, requiredClasses);
             }
           }
-      }
+      });
 
       return autoAllowedTags;
     },