MAGETWO-77744: [Magento Cloud] - Error message when uploading unsupported file format

Author: danielrenaud

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -49,6 +49,23 @@ define([
             });
         },
 
+        /**
+         * @private
+         */
+        _redirect: function (url) {
+            var urlParts, locationParts, forceReload;
+
+            urlParts = url.split('#');
+            locationParts = window.location.href.split('#');
+            forceReload = urlParts[0] === locationParts[0];
+
+            window.location.assign(url);
+
+            if (forceReload) {
+                window.location.reload();
+            }
+        },
+
         /**
          * @return {Boolean}
          */
@@ -119,12 +136,8 @@ define([
                             parameters.push(eventData.redirectParameters.join('&'));
                             res.backUrl = parameters.join('#');
                         }
-                        window.location.href = res.backUrl;
 
-                        // page does not reload when anchor (#) is added
-                        if (res.backUrl.indexOf('#') !== -1) {
-                            window.location.reload();
-                        }
+                        self._redirect(res.backUrl);
 
                         return;
                     }

app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml

@@ -22,7 +22,6 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
             <div class="control">
                 <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
                         data-selector="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
-                        data-attribute-code="<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
                         data-validate="{required:true}"
                         id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
                         class="super-attribute-select">

app/code/Magento/ConfigurableProduct/view/frontend/web/js/catalog-add-to-cart.js

@@ -9,9 +9,7 @@ require([
 
     $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
         $(data.form).find('select[name*="super"]').each(function (index, item) {
-            var $item = $(item);
-
-            data.redirectParameters.push($item.attr('data-attribute-code') + '=' + $item.val());
+            data.redirectParameters.push(item.config.id + '=' + $(item).val());
         });
     });
 });

app/code/Magento/Swatches/view/frontend/web/js/catalog-add-to-cart.js

@@ -9,9 +9,16 @@ require([
 
     $('body').on('catalogCategoryAddToCartRedirect', function (event, data) {
         $(data.form).find('[name*="super"]').each(function (index, item) {
-            var $item = $(item);
+            var $item = $(item),
+                attr;
+
+            if ($item.attr('data-attr-name')) {
+                attr = $item.attr('data-attr-name');
+            } else {
+                attr = $item.parent().attr('attribute-code');
+            }
+            data.redirectParameters.push(attr + '=' + $item.val());
 
-            data.redirectParameters.push($item.attr('data-attr-name') + '=' + $item.val());
         });
     });
 });

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -1214,8 +1214,20 @@ define([
          */
         _EmulateSelected: function (selectedAttributes) {
             $.each(selectedAttributes, $.proxy(function (attributeCode, optionId) {
-                this.element.find('.' + this.options.classes.attributeClass +
-                    '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]').trigger('click');
+                var elem = this.element.find('.' + this.options.classes.attributeClass +
+                    '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]'),
+                    parentInput = elem.parent();
+
+                if (elem.hasClass('selected')) {
+                    return;
+                }
+
+                if (parentInput.hasClass(this.options.classes.selectClass)) {
+                    parentInput.val(optionId);
+                    parentInput.trigger('change');
+                } else {
+                    elem.trigger('click');
+                }
             }, this));
         },