X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Feditor%2Fjs%2Feditor.admin.es6.js;h=a9c040c72ed9e90823e9333c70f0281b17b7f361;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hp=b02fe8bc447a7c41e87ad50c9e0f23ae644c68e9;hpb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;p=yaffs-website diff --git a/web/core/modules/editor/js/editor.admin.es6.js b/web/core/modules/editor/js/editor.admin.es6.js index b02fe8bc4..a9c040c72 100644 --- a/web/core/modules/editor/js/editor.admin.es6.js +++ b/web/core/modules/editor/js/editor.admin.es6.js @@ -567,6 +567,7 @@ // If any filter's current status forbids the editor feature, return // false. Drupal.filterConfiguration.update(); + // eslint-disable-next-line no-restricted-syntax for (const filterID in Drupal.filterConfiguration.statuses) { if (Drupal.filterConfiguration.statuses.hasOwnProperty(filterID)) { const filterStatus = Drupal.filterConfiguration.statuses[filterID]; @@ -879,17 +880,15 @@ * up-to-date. */ update() { - for (const filterID in Drupal.filterConfiguration.statuses) { - if (Drupal.filterConfiguration.statuses.hasOwnProperty(filterID)) { - // Update status. - Drupal.filterConfiguration.statuses[filterID].active = $(`[name="filters[${filterID}][status]"]`).is(':checked'); + Object.keys(Drupal.filterConfiguration.statuses || {}).forEach((filterID) => { + // Update status. + Drupal.filterConfiguration.statuses[filterID].active = $(`[name="filters[${filterID}][status]"]`).is(':checked'); - // Update current rules. - if (Drupal.filterConfiguration.liveSettingParsers[filterID]) { - Drupal.filterConfiguration.statuses[filterID].rules = Drupal.filterConfiguration.liveSettingParsers[filterID].getRules(); - } + // Update current rules. + if (Drupal.filterConfiguration.liveSettingParsers[filterID]) { + Drupal.filterConfiguration.statuses[filterID].rules = Drupal.filterConfiguration.liveSettingParsers[filterID].getRules(); } - } + }); }, };