Merge remote-tracking branch 'goinc/MAGETWO-33655' into MAGETWO-34346

Author: orlangur

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

@@ -13,10 +13,11 @@
 
 <script>
     require([
+        'jquery',
         "prototype",
         "extjs/ext-tree-checkbox",
         "mage/adminhtml/form"
-    ], function(){
+    ], function(jQuery){
 
 //<![CDATA[
 
@@ -69,7 +70,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
     }
 });
 
-Ext.onReady(function()
+jQuery(function()
 {
     var categoryLoader = new Ext.tree.TreeLoader({
        dataUrl: '<?php echo $block->getLoadTreeUrl() ?>'

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

@@ -272,7 +272,7 @@ function _renderNewTree(config, scopeParams) {
     //updateContent(url); //commented since ajax requests replaced with http ones to load a category
 }
 
-Ext.onReady(function () {
+jQuery(function () {
     categoryLoader = new Ext.tree.TreeLoader({
         dataUrl:'<?php echo $block->getLoadTreeUrl() ?>'
     });

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

@@ -12,7 +12,7 @@
 <div id="<?php echo $_divId ?>" class="tree"></div>
 
 <script>
-require(["prototype", "extjs/ext-tree-checkbox"], function(){
+require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
 var tree<?php echo $block->getId() ?>;
 
@@ -54,7 +54,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
     }
 });
 
-Ext.onReady(function()
+jQuery(function()
 {
     var emptyNodeAdded = <?php echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 

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

@@ -35,8 +35,7 @@ require([
     "extjs/ext-tree-checkbox",
     'Magento_DesignEditor/js/tools-files'
 ], function(jQuery){
-
-Ext.onReady(function(){
+jQuery(function(){
     var Tree = Ext.tree;
     var tree = new Tree.TreePanel('tree', {
         animate:true,

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

@@ -17,10 +17,11 @@
 </fieldset>
 <script>
 require([
+    'jquery',
     'mage/template',
     "prototype",
     "extjs/ext-tree-checkbox"
-], function (mageTemplate) {
+], function (jQuery, mageTemplate) {
 
 //<![CDATA[
 
@@ -476,7 +477,7 @@ var WidgetInstance = {
 
 window.WidgetInstance = WidgetInstance;
 
-Ext.onReady(function(){
+jQuery(function(){
     <?php foreach ($block->getPageGroups() as $pageGroup): ?>
         WidgetInstance.addPageGroup(<?php echo Zend_Json::encode($pageGroup) ?>);
     <?php endforeach; ?>