Merge remote-tracking branch 'troll/MAGETWO-35357' into MAGETWO-35175

Author: orlangur

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -11,20 +11,20 @@
 class Upload extends \Magento\Backend\App\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var \Magento\Framework\Controller\Result\RawFactory
      */
-    protected $resultJsonFactory;
+    protected $resultRawFactory;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
         parent::__construct($context);
-        $this->resultJsonFactory = $resultJsonFactory;
+        $this->resultRawFactory = $resultRawFactory;
     }
 
     /**
@@ -36,7 +36,7 @@ protected function _isAllowed()
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Json
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {
@@ -72,6 +72,10 @@ public function execute()
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
 
-        return $this->resultJsonFactory->create()->setData($result);
+        /** @var \Magento\Framework\Controller\Result\Raw $response */
+        $response = $this->resultRawFactory->create();
+        $response->setHeader('Content-type', 'text/plain');
+        $response->setContents(json_encode($result));
+        return $response;
     }
 }

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml

@@ -10,7 +10,9 @@
 
 <?php $_divId = 'tree-div_' . time() ?>
 <div id="<?php echo $_divId ?>" class="tree"></div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
     require([
         'jquery',

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

@@ -35,7 +35,9 @@
        <div><?php echo __('This operation can take much time'); ?></div>
     </div>
 </div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 var tree;
 require([

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml

@@ -10,7 +10,9 @@
 
 <?php $_divId = 'tree' . $block->getId() ?>
 <div id="<?php echo $_divId ?>" class="tree"></div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

@@ -38,8 +38,11 @@ require([
             <span class="title"><?php echo __('Unassigned Attributes') ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
+        <!--[if IE]>
+        <script id="ie-deferred-loader" defer="defer" src=""></script>
+        <![endif]-->
             <script>
-require(["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
+define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
 
             //<![CDATA[
             var allowDragAndDrop = <?php echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
@@ -406,6 +409,7 @@ require(["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
             //]]>
 
 });
+require(["tree-panel"]);
 </script>
     </div>
 </div>

app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml

@@ -9,7 +9,7 @@
 
 ?>
 <script>
-require(['jquery'], function(){
+require(["tree-panel"], function(){
 ConfigurableNodeExists = function(currentNode) {
     for (var i in currentNode.childNodes ) {
         if (currentNode.childNodes[i].id) {

app/code/Magento/DesignEditor/view/adminhtml/templates/editor/tools/files/tree.phtml

@@ -28,7 +28,9 @@
 </div>
 
 <div id="tree" style="width:100%; overflow:auto;"></div>
-
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 require([
     'jquery',

app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml

@@ -15,6 +15,9 @@
         <div class="actions"><?php echo $block->getAddLayoutButtonHtml() ?></div>
     </div>
 </fieldset>
+<!--[if IE]>
+<script id="ie-deferred-loader" defer="defer" src=""></script>
+<![endif]-->
 <script>
 require([
     'jquery',

lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php

@@ -99,10 +99,7 @@ public function getListToMove()
      */
     public function getListToRemove()
     {
-        return array_keys(array_intersect_key(
-            $this->_scheduledElements,
-            array_merge($this->_scheduledRemoves, $this->_brokenParent)
-        ));
+        return array_keys(array_intersect_key($this->_scheduledElements, $this->_scheduledRemoves));
     }
 
     /**