MAGETWO-43891: Expanded 'Downloadable Information' tab with active 'Is this downloadable Product?' checkbox if create virtual product

Andrii Lugovyi · Andrii Lugovyi · commit dcfa0344d50d · 2015-10-29T20:21:45.000+02:00
- fix js static
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js b/app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js
@@ -7,20 +7,36 @@ define([
     'jquery',
     'Magento_Catalog/catalog/type-events',
     'Magento_Catalog/js/product/weight-handler'
-], function($, productType, weight){
-    "use strict";
+], function ($, productType, weight) {
+    'use strict';
 
     return {
-        'Magento_Bundle/js/bundle-type-handler': function(data) {
+
+        /**
+         * Constructor component
+         */
+        'Magento_Bundle/js/bundle-type-handler': function () {
             this.bindAll();
             this._initType();
         },
+
+        /**
+         * Bind all
+         */
         bindAll: function () {
             $(document).on('changeTypeProduct', this._initType.bind(this));
         },
+
+        /**
+         * Init type
+         * @private
+         */
         _initType: function () {
-            if (productType.type.real == 'bundle'
-                && productType.type.current != 'bundle' && !weight.isLocked()) {
+            if (
+                productType.type.real === 'bundle' &&
+                productType.type.current !== 'bundle' &&
+                !weight.isLocked()
+            ) {
                 weight.switchWeight();
             }
         }
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/apply-to-type-switcher.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/apply-to-type-switcher.js
@@ -3,12 +3,14 @@
  * See COPYING.txt for license details.
  */
 define([
-    "jquery",
+    'jquery',
     'Magento_Catalog/js/product/weight-handler',
     'Magento_Catalog/catalog/type-events'
-], function($, weight, productType) {
+], function ($, weight, productType) {
+    'use strict';
 
     return {
+
         /**
          * Bind event
          */
@@ -18,14 +20,17 @@ define([
                 this._switchToTypeByApplyAttr.bind(this)
             );
 
-            $("#product_info_tabs").on(
-                "beforePanelsMove tabscreate tabsactivate",
+            $('#product_info_tabs').on(
+                'beforePanelsMove tabscreate tabsactivate',
                 this._switchToTypeByApplyAttr.bind(this)
             );
 
             $(document).on('changeTypeProduct', this._switchToTypeByApplyAttr.bind(this));
         },
 
+        /**
+         * Constructor component
+         */
         'Magento_Catalog/catalog/apply-to-type-switcher': function () {
             this.bindAll();
             this._switchToTypeByApplyAttr();
@@ -36,11 +41,12 @@ define([
          *
          * @private
          */
-        _switchToTypeByApplyAttr: function() {
-            $('[data-apply-to]:not(.removed)').each(function(index, element) {
+        _switchToTypeByApplyAttr: function () {
+            $('[data-apply-to]:not(.removed)').each(function (index, element) {
                 var attrContainer = $(element),
-                    applyTo = attrContainer.data('applyTo') || [];
-                var $inputs = attrContainer.find('select, input, textarea');
+                    applyTo = attrContainer.data('applyTo') || [],
+                    $inputs = attrContainer.find('select, input, textarea');
+
                 if (applyTo.length === 0 || $.inArray(productType.type.current, applyTo) !== -1) {
                     attrContainer.removeClass('not-applicable-attribute');
                     $inputs.removeClass('ignore-validate');
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/type-events.js
@@ -5,12 +5,17 @@
 define([
     'jquery',
     'Magento_Catalog/js/product/weight-handler'
-], function($, weight) {
+], function ($, weight) {
+    'use strict';
 
     return {
         $type: $('#product_type_id'),
+
+        /**
+         * Init
+         */
         init: function () {
-            //todo: need refactoring
+
             if (weight.productHasWeight()) {
                 this.type = {
                     virtual: 'virtual',
@@ -26,20 +31,35 @@ define([
 
             this.bindAll();
         },
+
+        /**
+         * Bind all
+         */
         bindAll: function () {
             $(document).on('setTypeProduct', function (event, type) {
                 this.setType(type);
             }.bind(this));
 
             //direct change type input
-            this.$type.on('change', function() {
+            this.$type.on('change', function () {
                 this.type.current = this.$type.val();
                 this._notifyType();
             }.bind(this));
         },
+
+        /**
+         * Set type
+         * @param {String} type - type product (downloadable, simple, virtual ...)
+         * @returns {*}
+         */
         setType: function (type) {
             return this.$type.val(type || this.type.real).trigger('change');
         },
+
+        /**
+         * Notify type
+         * @private
+         */
         _notifyType: function () {
             $(document).trigger('changeTypeProduct', this.type);
         }
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js b/app/code/Magento/Catalog/view/adminhtml/web/js/product/weight-handler.js
@@ -19,32 +19,74 @@ define([
         hideWeightSwitcher: function () {
             this.$weightSwitcher.hide();
         },
+
+        /**
+         * Is locked
+         * @returns {*}
+         */
         isLocked: function () {
             return this.$weight.is('[data-locked]');
         },
+
+        /**
+         * Disabled
+         */
         disabled: function () {
             this.$weight.addClass('ignore-validate').prop('disabled', true);
         },
+
+        /**
+         * Enabled
+         */
         enabled: function () {
             this.$weight.removeClass('ignore-validate').prop('disabled', false);
         },
-        switchWeight: function() {
+
+        /**
+         * Switch Weight
+         * @returns {*}
+         */
+        switchWeight: function () {
             return this.productHasWeight() ? this.enabled() : this.disabled();
         },
+
+        /**
+         * Product has weight
+         * @returns {Bool}
+         */
         productHasWeight: function () {
-            return $('input:checked', this.$weightSwitcher).val() == 1;
+            return $('input:checked', this.$weightSwitcher).val() === '1';
         },
+
+        /**
+         * Notify product weight is changed
+         * @returns {*|jQuery}
+         */
         notifyProductWeightIsChanged: function () {
             return $('input:checked', this.$weightSwitcher).trigger('change');
         },
+
+        /**
+         * Change
+         * @param {String} data
+         */
         change: function (data) {
             var value = data !== undefined ? +data : !this.productHasWeight();
-            $('input[value='+ value +']', this.$weightSwitcher).prop('checked', true);
+
+            $('input[value=' + value + ']', this.$weightSwitcher).prop('checked', true);
         },
+
+        /**
+         * Constructor component
+         */
         'Magento_Catalog/js/product/weight-handler': function () {
             this.bindAll();
             this.switchWeight();
         },
+
+        /**
+         * Bind all
+         */
         bindAll: function () {
             this.$weightSwitcher.find('input').on('change', this.switchWeight.bind(this));
         }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/configurable-type-handler.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/configurable-type-handler.js
@@ -11,18 +11,19 @@ define([
     'Magento_Ui/js/modal/modal',
     'mage/translate',
     'domReady!'
-], function($, productType, advancedPricingHandler, priceTypeHandler){
+], function ($, productType, advancedPricingHandler, priceTypeHandler) {
     'use strict';
 
     return {
         $block: null,
         hasVariations: null,
-        configurationSectionMessageHandler: (function() {
-            var title = $('[data-role="product-create-configuration-info"]');
-            var buttons = $('[data-action="product-create-configuration-buttons"]');
-            var newText = 'Configurations cannot be created for a standard product with downloadable files.' +
-                ' To create configurations, first remove all downloadable files.';
-            var oldText = title.text();
+        configurationSectionMessageHandler: (function () {
+            var title = $('[data-role="product-create-configuration-info"]'),
+                buttons = $('[data-action="product-create-configuration-buttons"]'),
+                newText = 'Configurations cannot be created for a standard product with downloadable files.' +
+                ' To create configurations, first remove all downloadable files.',
+                oldText = title.text();
+
             return function (change) {
                 if (change) {
                     title.text(newText);
@@ -31,8 +32,16 @@ define([
                     title.text(oldText);
                     buttons.show();
                 }
-            }.bind(this);
+            };
         }()),
+
+        /**
+         * Set element disabled
+         * @param {Object} $element - jquery instance element
+         * @param {Bool} state
+         * @param {Bool} triggerEvent
+         * @private
+         */
         _setElementDisabled: function ($element, state, triggerEvent) {
             if (!$element.is('[data-locked]')) {
                 $element.prop('disabled', state);
@@ -42,20 +51,38 @@ define([
                 }
             }
         },
+
+        /**
+         * Show
+         */
         show: function () {
             this.configurationSectionMessageHandler(false);
         },
+
+        /**
+         * Hide
+         */
         hide: function () {
             this.configurationSectionMessageHandler(true);
         },
+
+        /**
+         * Bind all
+         */
         bindAll: function () {
             $(document).on('changeConfigurableTypeProduct', function (event, isConfigurable) {
                 $(document).trigger('setTypeProduct', isConfigurable ? 'configurable' : null);
-            }.bind(this));
+            });
             $(document).on('changeTypeProduct', this._initType.bind(this));
         },
+
+        /**
+         * Init type
+         * @private
+         */
         _initType: function () {
             var suggestContainer = $('#product-template-suggest-container .action-dropdown > .action-toggle');
+
             if (productType.type.current === 'configurable') {
                 suggestContainer.addClass('disabled').prop('disabled', true);
                 $('#inventory_qty').prop('disabled', true);
@@ -76,9 +103,14 @@ define([
                 this.show();
             }
         },
-        'Magento_ConfigurableProduct/js/configurable-type-handler': function (inData) {
-            this.$block = $(inData.blockId + ' input[name="attributes[]"]');
-            this.hasVariations = inData.hasVariations;
+
+        /**
+         * Constructor component
+         * @param {Object} data - this backend data
+         */
+        'Magento_ConfigurableProduct/js/configurable-type-handler': function (data) {
+            this.$block = $(data.blockId + ' input[name="attributes[]"]');
+            this.hasVariations = data.hasVariations;
 
             advancedPricingHandler.init();
             priceTypeHandler.init();
diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js b/app/code/Magento/Downloadable/view/adminhtml/web/downloadable-type-handler.js
@@ -7,37 +7,59 @@ define([
     'jquery',
     'Magento_Catalog/js/product/weight-handler',
     'Magento_Catalog/catalog/type-events'
-], function($, weight, productType) {
-    "use strict";
+], function ($, weight, productType) {
+    'use strict';
 
     return {
         $checkbox: $('[data-action=change-type-product-downloadable]'),
         $items: $('#product_info_tabs_downloadable_items'),
         $tab: null,
         isDownloadable: false,
+
+        /**
+         * Show
+         */
         show: function () {
             this.$checkbox.prop('checked', true);
             this.$items.show();
         },
+
+        /**
+         * Hide
+         */
         hide: function () {
             this.$checkbox.prop('checked', false);
             this.$items.hide();
         },
-        'Magento_Downloadable/downloadable-type-handler': function(data) {
-            this.$tab = $('[data-tab='+data.tabId+']');
+
+        /**
+         * Constructor component
+         * @param {Object} data - this backend data
+         */
+        'Magento_Downloadable/downloadable-type-handler': function (data) {
+            this.$tab = $('[data-tab=' + data.tabId + ']');
             this.isDownloadable = data.isDownloadable;
             this.bindAll();
             this._initType();
         },
+
+        /**
+         * Bind all
+         */
         bindAll: function () {
             this.$checkbox.on('change', function (event) {
                 $(document).trigger('setTypeProduct', $(event.target).prop('checked') ? 'downloadable' : null);
-            }.bind(this));
+            });
 
             $(document).on('changeTypeProduct', this._initType.bind(this));
         },
+
+        /**
+         * Init type
+         * @private
+         */
         _initType: function () {
-            if (productType.type.current == 'downloadable') {
+            if (productType.type.current === 'downloadable') {
                 weight.change(false);
                 weight.$weightSwitcher.one('change', function () {
                     $(document).trigger('setTypeProduct', null);
