Merge branch 'MAGETWO-70646' of github.com:magento-folks/magento2ce into 2.2-bugs

Author: omiroshnichenko

app/code/Magento/Checkout/etc/frontend/di.xml

@@ -33,6 +33,7 @@
         <arguments>
             <argument name="clientSideSections" xsi:type="array">
                 <item name="checkout-data" xsi:type="string">checkout-data</item>
+                <item name="cart-data" xsi:type="string">cart-data</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml

@@ -21,7 +21,7 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         "Magento_Ui/js/modal/modal"
     ], function(jQuery){
 
-        packaging = new Packaging(<?= /* @escapeNotVerified */ $block->getConfigDataJson() ?>);
+        window.packaging = new Packaging(<?= /* @escapeNotVerified */ $block->getConfigDataJson() ?>);
         packaging.changeContainerType($$('select[name=package_container]')[0]);
         packaging.checkSizeAndGirthParameter(
             $$('select[name=package_container]')[0],
@@ -76,6 +76,8 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
                     }
             }]
         });
+        jQuery(document).trigger('packaging:inited');
+        jQuery(document).data('packagingInited', true);
     });
 </script>
 <?php include ($block->getTemplateFile('Magento_Shipping::order/packaging/popup_content.phtml')) ?>

app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml

@@ -70,25 +70,30 @@
                 <?= $block->getChildHtml('shipment_tracking') ?>
 
                 <?= $block->getChildHtml('shipment_packaging') ?>
-<script>
-    require([
-        'prototype'
-    ], function () {
+                <script>
+                    require([
+                        'jquery',
+                        'prototype'
+                    ], function (jQuery) {
+                        var setCallbacks = function () {
+                            window.packaging.setConfirmPackagingCallback(function () {
+                                window.packaging.sendCreateLabelRequest();
+                            });
+                            window.packaging.setLabelCreatedCallback(function () {
+                                setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
+                                    'adminhtml/order_shipment/view',
+                                    ['shipment_id' => $block->getShipment()->getId()]
+                                ); ?>");
+                            });
+                        };
 
-        setTimeout(function () {
-            packaging.setConfirmPackagingCallback(function () {
-                packaging.sendCreateLabelRequest();
-            });
-            packaging.setLabelCreatedCallback(function (response) {
-                setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
-'adminhtml/order_shipment/view',
-['shipment_id' => $block->getShipment()->getId()]
-); ?>");
-            });
-        }, 500);
-
-    });
-</script>
+                        if (jQuery(document).data('packagingInited')) {
+                            setCallbacks();
+                        } else {
+                            jQuery(document).on('packaging:inited', setCallbacks);
+                        }
+                    });
+                </script>
             </div>
         </div>
     </div>