X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Fmodules%2Fcontent_translation%2Fcontent_translation.admin.es6.js;fp=web%2Fcore%2Fmodules%2Fcontent_translation%2Fcontent_translation.admin.es6.js;h=53ace084db0394cb8fc0619879dc50afcb704f83;hb=af6d1fb995500ae68849458ee10d66abbdcfb252;hp=1b9e952840585dad6602337103e35ca16127d40d;hpb=680c79a86e3ed402f263faeac92e89fb6d9edcc0;p=yaffs-website

diff --git a/web/core/modules/content_translation/content_translation.admin.es6.js b/web/core/modules/content_translation/content_translation.admin.es6.js
index 1b9e95284..53ace084d 100644
--- a/web/core/modules/content_translation/content_translation.admin.es6.js
+++ b/web/core/modules/content_translation/content_translation.admin.es6.js
@@ -17,11 +17,10 @@
       const $context = $(context);
       const options = drupalSettings.contentTranslationDependentOptions;
       let $fields;
-      let dependent_columns;
 
-      function fieldsChangeHandler($fields, dependent_columns) {
+      function fieldsChangeHandler($fields, dependentColumns) {
         return function (e) {
-          Drupal.behaviors.contentTranslationDependentOptions.check($fields, dependent_columns, $(e.target));
+          Drupal.behaviors.contentTranslationDependentOptions.check($fields, dependentColumns, $(e.target));
         };
       }
 
@@ -29,18 +28,16 @@
       // that name and copy over the input values that require all columns to be
       // translatable.
       if (options && options.dependent_selectors) {
-        for (const field in options.dependent_selectors) {
-          if (options.dependent_selectors.hasOwnProperty(field)) {
-            $fields = $context.find(`input[name^="${field}"]`);
-            dependent_columns = options.dependent_selectors[field];
+        Object.keys(options.dependent_selectors).forEach((field) => {
+          $fields = $context.find(`input[name^="${field}"]`);
+          const dependentColumns = options.dependent_selectors[field];
 
-            $fields.on('change', fieldsChangeHandler($fields, dependent_columns));
-            Drupal.behaviors.contentTranslationDependentOptions.check($fields, dependent_columns);
-          }
-        }
+          $fields.on('change', fieldsChangeHandler($fields, dependentColumns));
+          Drupal.behaviors.contentTranslationDependentOptions.check($fields, dependentColumns);
+        });
       }
     },
-    check($fields, dependent_columns, $changed) {
+    check($fields, dependentColumns, $changed) {
       let $element = $changed;
       let column;
 
@@ -50,23 +47,21 @@
 
       // A field that has many different translatable parts can also define one
       // or more columns that require all columns to be translatable.
-      for (const index in dependent_columns) {
-        if (dependent_columns.hasOwnProperty(index)) {
-          column = dependent_columns[index];
+      Object.keys(dependentColumns || {}).forEach((index) => {
+        column = dependentColumns[index];
 
-          if (!$changed) {
-            $element = $fields.filter(filterFieldsList);
-          }
+        if (!$changed) {
+          $element = $fields.filter(filterFieldsList);
+        }
 
-          if ($element.is(`input[value="${column}"]:checked`)) {
-            $fields.prop('checked', true)
-              .not($element).prop('disabled', true);
-          }
-          else {
-            $fields.prop('disabled', false);
-          }
+        if ($element.is(`input[value="${column}"]:checked`)) {
+          $fields.prop('checked', true)
+            .not($element).prop('disabled', true);
         }
-      }
+        else {
+          $fields.prop('disabled', false);
+        }
+      });
     },
   };
 
@@ -89,7 +84,12 @@
           $bundleSettings.nextUntil('.bundle-settings').hide();
         }
         else {
-          $bundleSettings.nextUntil('.bundle-settings', '.field-settings').find('.translatable :input:not(:checked)').closest('.field-settings').nextUntil(':not(.column-settings)').hide();
+          $bundleSettings
+            .nextUntil('.bundle-settings', '.field-settings')
+            .find('.translatable :input:not(:checked)')
+            .closest('.field-settings')
+            .nextUntil(':not(.column-settings)')
+            .hide();
         }
       });