Merge remote-tracking branch 'mpi/MC-19866' into Chaika-2019-09-12-CE

Author: veloraven

lib/web/mage/adminhtml/wysiwyg/widget.js

@@ -223,26 +223,29 @@ define([
          * @param {*} containerId
          */
         enableOptionsContainer: function (containerId) {
-            $$('#' + containerId + ' .widget-option').each(function (e) {
+            var container = $(containerId);
+
+            container.select('.widget-option').each(function (e) {
                 e.removeClassName('skip-submit');
 
                 if (e.hasClassName('obligatory')) {
                     e.removeClassName('obligatory');
                     e.addClassName('required-entry');
                 }
             });
-            $(containerId).removeClassName('no-display');
+            container.removeClassName('no-display');
         },
 
         /**
          * @param {*} containerId
          */
         disableOptionsContainer: function (containerId) {
+            var container = $(containerId);
 
-            if ($(containerId).hasClassName('no-display')) {
+            if (container.hasClassName('no-display')) {
                 return;
             }
-            $$('#' + containerId + ' .widget-option').each(function (e) {
+            container.select('.widget-option').each(function (e) {
                 // Avoid submitting fields of unactive container
                 if (!e.hasClassName('skip-submit')) {
                     e.addClassName('skip-submit');
@@ -253,7 +256,7 @@ define([
                     e.addClassName('obligatory');
                 }
             });
-            $(containerId).addClassName('no-display');
+            container.addClassName('no-display');
         },
 
         /**
@@ -439,7 +442,7 @@ define([
                 i = 0;
                 Form.getElements($(this.formEl)).each(function (e) {
 
-                    if (!e.hasClassName('skip-submit')) {
+                    if (jQuery(e).closest('.skip-submit, .no-display').length === 0) {
                         formElements[i] = e;
                         i++;
                     }