Merge pull request #3221 from magento-tsg-csl3/2.3-develop-pr9

[TSG-CSL3] Forwardporting 2.3 (pr9)
magento · Sep 28, 2018 · 8460e4e · 8460e4e
2 parents 6e05396 + 8fe71d7
commit 8460e4e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -118,7 +118,7 @@ private function getCacheManager()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -130,7 +130,7 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -289,6 +289,7 @@ protected function customizeCategoriesField(array $meta)
                                     'source' => 'product_details',
                                     'displayArea' => 'insideGroup',
                                     'sortOrder' => 20,
+                                    'dataScope'  => $fieldCode,
                                 ],
                             ],
                         ]

diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -48,7 +48,7 @@ define([
                         if (typeof controlButtonArea != 'undefined') {
                             var buttons = controlButtonArea.childElements();
                             for (var i = 0; i < buttons.length; i++) {
-                                if (buttons[i].innerHTML.include(button.label)) {
+                                if (buttons[i].innerHTML.include(button.getLabel())) {
                                     return;
                                 }
                             }
@@ -1432,6 +1432,10 @@ define([
             node.update('<span>' + this._label + '</span>');
             content[position] = node;
             Element.insert(element, content);
+        },
+
+        getLabel: function(){
+            return this._label;
         }
     };
 

diff --git a/lib/web/fotorama/fotorama.js b/lib/web/fotorama/fotorama.js
@@ -2568,7 +2568,7 @@ fotoramaVersion = '4.6.4';
                     thisData.t > rightLimit : thisData.l > rightLimit;
                 specialMeasures.w = thisData.w;
 
-                if (thisData.l + thisData.w < leftLimit
+                if ((opts.navdir !== 'vertical' && thisData.l + thisData.w < leftLimit)
                     || exceedLimit
                     || callFit(thisData.$img, specialMeasures)) return;