From a8225336d981f62d59c83bcbcbaaaa549cb6f540 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Wed, 21 Sep 2016 12:20:28 +0800 Subject: [PATCH] MDL-56052 block_settings: race condition YUI events module must be loaded before global events can be used. --- blocks/settings/amd/build/settingsblock.min.js | 2 +- blocks/settings/amd/src/settingsblock.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/blocks/settings/amd/build/settingsblock.min.js b/blocks/settings/amd/build/settingsblock.min.js index 8a8e7469600..1cebc858d7d 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(''+f.html()+"")}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 +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(''+f.html()+"")}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.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 bdccda5d2b2..f17553f1822 100644 --- a/blocks/settings/amd/src/settingsblock.js +++ b/blocks/settings/amd/src/settingsblock.js @@ -40,9 +40,6 @@ define(['jquery', 'core/tree'], function($, Tree) { }; adminTree.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