Merge pull request #162 from magento-south/PR-Vanilla-Bugs

[Vanilla] Bugfixes
magento · Jul 19, 2016 · 27c7763 · 27c7763
2 parents f262529 + 7b04b5c
commit 27c7763
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 16 deletions.
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -303,6 +303,7 @@ protected function getBundleOptions()
                                 'data' => [
                                     'config' => [
                                         'componentType' => 'fieldset',
+                                        'collapsible' => true,
                                         'label' => '',
                                         'opened' => true,
                                     ],

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -386,6 +386,7 @@ protected function getOptionsGridConfig($sortOrder)
                                 'data' => [
                                     'config' => [
                                         'componentType' => Fieldset::NAME,
+                                        'collapsible' => true,
                                         'label' => null,
                                         'sortOrder' => 10,
                                         'opened' => true,

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -8,7 +8,7 @@
     <!-- ko text: currentBillingAddress().prefix --><!-- /ko --> <!-- ko text: currentBillingAddress().firstname --><!-- /ko -->
     <!-- ko text: currentBillingAddress().lastname --><!-- /ko --> <!-- ko text: currentBillingAddress().suffix --><!-- /ko --><br/>
     <!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
-    <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <!-- ko text: currentBillingAddress().region --><!-- /ko --> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
+    <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <span data-bind="html: currentBillingAddress().region"></span> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
     <!-- ko if: (currentBillingAddress().telephone) -->
     <a data-bind="text: currentBillingAddress().telephone, attr: {'href': 'tel:' + currentBillingAddress().telephone}"></a>

diff --git a/...agento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/...agento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -8,7 +8,7 @@
     <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko -->
     <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
     <!-- ko text: address().street --><!-- /ko --><br/>
-    <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
+    <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
     <!-- ko if: (address().telephone) -->
     <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>

diff --git a/...to/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/...to/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -8,7 +8,7 @@
     <!-- ko text: address().prefix --><!-- /ko --> <!-- ko text: address().firstname --><!-- /ko -->
     <!-- ko text: address().lastname --><!-- /ko --> <!-- ko text: address().suffix --><!-- /ko --><br/>
     <!-- ko text: address().street --><!-- /ko --><br/>
-    <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
+    <!-- ko text: address().city --><!-- /ko -->, <span data-bind="html: address().region"></span> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
     <!-- ko if: (address().telephone) -->
     <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>

diff --git a/app/code/Magento/Payment/view/adminhtml/web/transparent.js b/app/code/Magento/Payment/view/adminhtml/web/transparent.js
@@ -91,6 +91,9 @@ define([
                     } else {
                         this._processErrors(response);
                     }
+                },
+                complete: function () {
+                    $('body').trigger('processStop');
                 }
             });
         },

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -57,6 +57,11 @@ var config = {
             "jquery/jstree/jquery.jstree": {
                 "mage/backend/jstree-mixin": true
             }
+        },
+        "text": {
+            "headers": {
+                "X-Requested-With": "XMLHttpRequest"
+            }
         }
     }
 };

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -106,8 +106,8 @@ define([
 
             this._super();
 
-            scope   = this.dataScope;
-            name    = scope.split('.').slice(1);
+            scope = this.dataScope;
+            name = scope.split('.').slice(1);
 
             valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate;
 
@@ -264,7 +264,7 @@ define([
          * @returns {Abstract} Chainable.
          */
         setValidation: function (rule, options) {
-            var rules =  utils.copy(this.validation),
+            var rules = utils.copy(this.validation),
                 changed;
 
             if (_.isObject(rule)) {
@@ -306,7 +306,7 @@ define([
          *
          * @returns {Boolean}
          */
-        hasService: function() {
+        hasService: function () {
             return this.service && this.service.template;
         },
 
@@ -379,8 +379,8 @@ define([
          * @returns {Object} Validate information.
          */
         validate: function () {
-            var value   = this.value(),
-                result  = validator(this.validation, value, this.validationParams),
+            var value = this.value(),
+                result = validator(this.validation, value, this.validationParams),
                 message = !this.disabled() && this.visible() ? result.message : '',
                 isValid = this.disabled() || !this.visible() || result.passed;
 
@@ -412,6 +412,7 @@ define([
          */
         restoreToDefault: function () {
             this.value(this.default);
+            this.focused(true);
         },
 
         /**
@@ -433,7 +434,7 @@ define([
         /**
          *  Callback when value is changed by user
          */
-        userChanges: function() {
+        userChanges: function () {
             this.valueChangedByUser = true;
         }
     });

diff --git a/app/code/Magento/Ui/view/base/web/js/form/form.js b/app/code/Magento/Ui/view/base/web/js/form/form.js
@@ -155,6 +155,7 @@ define([
             additionalInvalid: false,
             selectorPrefix: '.page-content',
             messagesClass: 'messages',
+            errorClass: '.admin__field._error',
             eventPrefix: '.${ $.index }',
             ajaxSave: false,
             ajaxSaveType: 'default',
@@ -247,11 +248,16 @@ define([
          * @param {Object} data
          */
         save: function (redirect, data) {
+            var scrollTop;
+
             this.validate();
 
             if (!this.additionalInvalid && !this.source.get('params.invalid')) {
                 this.setAdditionalData(data)
                     .submit(redirect);
+            } else {
+                scrollTop = $(this.errorClass).offset().top - window.innerHeight / 2;
+                window.scrollTo(0, scrollTop);
             }
         },
 

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html
@@ -33,9 +33,9 @@
                 <td css="$parents[1].setClasses(elem)" if="elem.template">
                     <div class="fieldset-wrapper admin__collapsible-block-wrapper"
                          collapsible="openClass: '_show', closeOnOuter: false, opened: elem.opened()">
-                        <div class="fieldset-wrapper-title" toggleCollapsible>
+                        <div class="fieldset-wrapper-title">
 
-                            <div class="admin__collapsible-title" data-role="collapsible-title">
+                            <div class="admin__collapsible-title" data-role="collapsible-title" click="elem.toggleOpened">
                                 <render args="name: $parents[1].dndConfig.template, data: $parents[1].dnd"
                                         if="$parents[1].dndConfig.enabled" />
 
@@ -53,7 +53,7 @@
                         </div>
 
                         <div class="admin__collapsible-content"
-                             css="{_show: $collapsible.opened()}"
+                             css="{_show: $data.opened()}"
                              data-role="collapsible-content"
                              template="elem.template"></div>
                     </div>

diff --git a/lib/web/mage/requirejs/text.js b/lib/web/mage/requirejs/text.js
@@ -89,6 +89,8 @@ define(['module'], function (module) {
             header,
             errorHandler = fail || Function();
 
+        xhr.open('GET', url);
+
         /*eslint-disable max-depth */
         if ('setRequestHeader' in xhr && headers) {
             for (header in headers) {
@@ -127,7 +129,6 @@ define(['module'], function (module) {
             }
         };
 
-        xhr.open('GET', url);
         xhr.send();
     }
 

diff --git a/lib/web/mage/utils/misc.js b/lib/web/mage/utils/misc.js
@@ -171,12 +171,12 @@ define([
                     config.response.status(undefined);
                     config.response.status(!data.error);
                 })
-                .fail(function (xhr) {
+                .fail(function () {
                     config.response.status(undefined);
                     config.response.status(false);
                     config.response.data({
                         error: true,
-                        messages: xhr.statusText,
+                        messages: 'Something went wrong.',
                         t: t
                     });
                 })