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

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

diff --git a/web/core/modules/content_translation/content_translation.admin.js b/web/core/modules/content_translation/content_translation.admin.js
index 2d524870e99767fe5b69fe2586bfa518ffcf4d83..33e3fbd45be22de21ae9b65cf18500650e6e19a2 100644 (file)
--- a/web/core/modules/content_translation/content_translation.admin.js
+++ b/web/core/modules/content_translation/content_translation.admin.js
@@ -11,27 +11,24 @@
       var $context = $(context);
       var options = drupalSettings.contentTranslationDependentOptions;
       var $fields = void 0;
-      var dependent_columns = void 0;
 
-      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));
         };
       }
 
       if (options && options.dependent_selectors) {
-        for (var 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(function (field) {
+          $fields = $context.find('input[name^="' + field + '"]');
+          var 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: function check($fields, dependent_columns, $changed) {
+    check: function check($fields, dependentColumns, $changed) {
       var $element = $changed;
       var column = void 0;
 
@@ -39,21 +36,19 @@
         return $(field).val() === column;
       }
 
-      for (var index in dependent_columns) {
-        if (dependent_columns.hasOwnProperty(index)) {
-          column = dependent_columns[index];
+      Object.keys(dependentColumns || {}).forEach(function (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);
         }
-      }
+      });
     }
   };