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

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

diff --git a/web/core/modules/editor/js/editor.admin.js b/web/core/modules/editor/js/editor.admin.js
index 377aef23244c8259e5104739ac3f6b81dd603778..9cec9ada6aec6256fa718fb29ac8fa74ed7b25f6 100644 (file)
--- a/web/core/modules/editor/js/editor.admin.js
+++ b/web/core/modules/editor/js/editor.admin.js
@@ -256,6 +256,7 @@
       }
 
       Drupal.filterConfiguration.update();
+
       for (var filterID in Drupal.filterConfiguration.statuses) {
         if (Drupal.filterConfiguration.statuses.hasOwnProperty(filterID)) {
           var filterStatus = Drupal.filterConfiguration.statuses[filterID];
@@ -331,15 +332,13 @@
     liveSettingParsers: {},
 
     update: function update() {
-      for (var filterID in Drupal.filterConfiguration.statuses) {
-        if (Drupal.filterConfiguration.statuses.hasOwnProperty(filterID)) {
-          Drupal.filterConfiguration.statuses[filterID].active = $('[name="filters[' + filterID + '][status]"]').is(':checked');
+      Object.keys(Drupal.filterConfiguration.statuses || {}).forEach(function (filterID) {
+        Drupal.filterConfiguration.statuses[filterID].active = $('[name="filters[' + filterID + '][status]"]').is(':checked');
 
-          if (Drupal.filterConfiguration.liveSettingParsers[filterID]) {
-            Drupal.filterConfiguration.statuses[filterID].rules = Drupal.filterConfiguration.liveSettingParsers[filterID].getRules();
-          }
+        if (Drupal.filterConfiguration.liveSettingParsers[filterID]) {
+          Drupal.filterConfiguration.statuses[filterID].rules = Drupal.filterConfiguration.liveSettingParsers[filterID].getRules();
         }
-      }
+      });
     }
   };