[Magento Community Engineering] Community Contributions - 2.3-develop

- merged latest code from mainline branch
magento · Nov 25, 2019 · 3fc0360 · 3fc0360
2 parents 84647d8 + f2d026d
commit 3fc0360
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 10 deletions.
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/summary/shipping.js
@@ -5,10 +5,11 @@
 
 define([
     'jquery',
+    'underscore',
     'Magento_Checkout/js/view/summary/abstract-total',
     'Magento_Checkout/js/model/quote',
     'Magento_SalesRule/js/view/summary/discount'
-], function ($, Component, quote, discountView) {
+], function ($, _, Component, quote, discountView) {
     'use strict';
 
     return Component.extend({
@@ -22,19 +23,23 @@ define([
          * @return {*}
          */
         getShippingMethodTitle: function () {
-            var shippingMethod = '',
+            var shippingMethod,
                 shippingMethodTitle = '';
 
             if (!this.isCalculated()) {
                 return '';
             }
             shippingMethod = quote.shippingMethod();
 
+            if (!_.isArray(shippingMethod) && !_.isObject(shippingMethod)) {
+                return '';
+            }
+
             if (typeof shippingMethod['method_title'] !== 'undefined') {
                 shippingMethodTitle = ' - ' + shippingMethod['method_title'];
             }
 
-            return shippingMethod ?
+            return shippingMethodTitle ?
                 shippingMethod['carrier_title'] + shippingMethodTitle :
                 shippingMethod['carrier_title'];
         },

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -67,7 +67,7 @@
                 </div>
             </div>
         </div>
-        <div class="field confirm password required" data-container="confirm-password">
+        <div class="field confirmation password required" data-container="confirm-password">
             <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation"
@@ -93,7 +93,7 @@
     ], function($){
         var dataForm = $('#form-validate');
         var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
-        
+
         dataForm.mage('validation', {
         <?php if ($_dob->isEnabled()) : ?>
             errorPlacement: function(error, element) {

diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
@@ -338,7 +338,7 @@
                     top: 0;
                     left: 100%;
                     width: 10px;
-                    height: calc(100% + 3px);
+                    height: calc(~'100% + 3px');
                     z-index: 1;
                 }
             }

diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
@@ -102,28 +102,51 @@ define([
          * @private
          */
         _processPanels: function () {
-            this.contents = this.element.find(this.options.content);
+            var isNotNested = this._isNotNested.bind(this);
 
-            this.collapsibles = this.element.find(this.options.collapsibleElement);
+            this.contents = this.element
+                .find(this.options.content)
+                .filter(isNotNested);
+
+            this.collapsibles =  this.element
+                .find(this.options.collapsibleElement)
+                .filter(isNotNested);
 
             this.collapsibles
                 .attr('role', 'presentation')
                 .parent()
                 .attr('role', 'tablist');
 
-            this.headers = this.element.find(this.options.header);
+            this.headers = this.element
+                .find(this.options.header)
+                .filter(isNotNested);
 
             if (this.headers.length === 0) {
                 this.headers = this.collapsibles;
             }
-            this.triggers = this.element.find(this.options.trigger);
+            this.triggers = this.element
+                .find(this.options.trigger)
+                .filter(isNotNested);
 
             if (this.triggers.length === 0) {
                 this.triggers = this.headers;
             }
             this._callCollapsible();
         },
 
+        /**
+         * Checks if element is not in nested container to keep the correct scope of collapsible
+         * @param {Number} index
+         * @param {HTMLElement} element
+         * @private
+         * @return {Boolean}
+         */
+        _isNotNested: function (index, element) {
+            var parentContent = $(element).parents(this.options.content);
+
+            return !parentContent.length || !this.element.find(parentContent).length;
+        },
+
         /**
          * Setting the disabled and active tabs and calling instantiation of collapsible
          * @private