From 05263307d7b154331a5bc8be4b720e5e6a959c54 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 2 Jun 2016 10:07:52 +0800
Subject: [PATCH] MDL-54722 javascript: Add YUI depend wrapper to global event

---
 blocks/navigation/amd/build/navblock.min.js    |  2 +-
 blocks/navigation/amd/src/navblock.js          | 12 ++++++++----
 blocks/settings/amd/build/settingsblock.min.js |  2 +-
 blocks/settings/amd/src/settingsblock.js       | 11 +++++++++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/blocks/navigation/amd/build/navblock.min.js b/blocks/navigation/amd/build/navblock.min.js
index 60df49e5b9a..20255544242 100644
--- a/blocks/navigation/amd/build/navblock.min.js
+++ b/blocks/navigation/amd/build/navblock.min.js
@@ -1 +1 @@
-define(["jquery","core/tree"],function(a,b){return{init:function(a){var c=new b(".block_navigation .block_tree");c.finishExpandingGroup=function(c){b.prototype.finishExpandingGroup.call(this,c),Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})},c.collapseGroup=function(c){b.prototype.collapseGroup.call(this,c),Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})}}}});
\ No newline at end of file
+define(["jquery","core/tree"],function(a,b){return{init:function(a){var c=new b(".block_navigation .block_tree");c.finishExpandingGroup=function(c){b.prototype.finishExpandingGroup.call(this,c),Y.use("moodle-core-event",function(){Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})})},c.collapseGroup=function(c){b.prototype.collapseGroup.call(this,c),Y.use("moodle-core-event",function(){Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})})}}}});
\ No newline at end of file
diff --git a/blocks/navigation/amd/src/navblock.js b/blocks/navigation/amd/src/navblock.js
index cd44db3c914..40e8678e370 100644
--- a/blocks/navigation/amd/src/navblock.js
+++ b/blocks/navigation/amd/src/navblock.js
@@ -27,14 +27,18 @@ define(['jquery', 'core/tree'], function($, Tree) {
             var navTree = new Tree(".block_navigation .block_tree");
             navTree.finishExpandingGroup = function(item) {
                 Tree.prototype.finishExpandingGroup.call(this, item);
-                Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
-                    instanceid: instanceid
+                Y.use('moodle-core-event', function() {
+                    Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
+                        instanceid: instanceid
+                    });
                 });
             };
             navTree.collapseGroup = function(item) {
                 Tree.prototype.collapseGroup.call(this, item);
-                Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
-                    instanceid: instanceid
+                Y.use('moodle-core-event', function() {
+                    Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
+                        instanceid: instanceid
+                    });
                 });
             };
         }
diff --git a/blocks/settings/amd/build/settingsblock.min.js b/blocks/settings/amd/build/settingsblock.min.js
index de0b9b95e70..8a8e7469600 100644
--- a/blocks/settings/amd/build/settingsblock.min.js
+++ b/blocks/settings/amd/build/settingsblock.min.js
@@ -1 +1 @@
-define(["jquery","core/tree"],function(a,b){return{init:function(a,c){var d=new b(".block_settings .block_tree");if(c){var e=d.treeRoot.find("#"+c),f=e.children("a").first();f.replaceWith('<span tabindex="0">'+f.html()+"</span>")}d.finishExpandingGroup=function(c){b.prototype.finishExpandingGroup.call(this,c),Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})},d.collapseGroup=function(c){b.prototype.collapseGroup.call(this,c),Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})}}}});
\ No newline at end of file
+define(["jquery","core/tree"],function(a,b){return{init:function(a,c){var d=new b(".block_settings .block_tree");if(c){var e=d.treeRoot.find("#"+c),f=e.children("a").first();f.replaceWith('<span tabindex="0">'+f.html()+"</span>")}d.finishExpandingGroup=function(c){b.prototype.finishExpandingGroup.call(this,c),Y.use("moodle-core-event",function(){Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})})},d.collapseGroup=function(c){b.prototype.collapseGroup.call(this,c),Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a}),Y.use("moodle-core-event",function(){Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED,{instanceid:a})})}}}});
\ No newline at end of file
diff --git a/blocks/settings/amd/src/settingsblock.js b/blocks/settings/amd/src/settingsblock.js
index 01187fdf2da..bdccda5d2b2 100644
--- a/blocks/settings/amd/src/settingsblock.js
+++ b/blocks/settings/amd/src/settingsblock.js
@@ -32,8 +32,10 @@ define(['jquery', 'core/tree'], function($, Tree) {
             }
             adminTree.finishExpandingGroup = function(item) {
                 Tree.prototype.finishExpandingGroup.call(this, item);
-                Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
-                    instanceid: instanceid
+                Y.use('moodle-core-event', function() {
+                    Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
+                        instanceid: instanceid
+                    });
                 });
             };
             adminTree.collapseGroup = function(item) {
@@ -41,6 +43,11 @@ define(['jquery', 'core/tree'], function($, Tree) {
                 Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
                     instanceid: instanceid
                 });
+                Y.use('moodle-core-event', function() {
+                    Y.Global.fire(M.core.globalEvents.BLOCK_CONTENT_UPDATED, {
+                        instanceid: instanceid
+                    });
+                });
             };
         }
     };