mirror of
https://github.com/moodle/moodle.git
synced 2025-08-09 02:46:40 +02:00
Merge branch 'MDL-54722-master' of git://github.com/cameron1729/moodle
This commit is contained in:
commit
69dcebb04d
15 changed files with 84 additions and 26 deletions
|
@ -64,6 +64,9 @@ M.core.dock._dockableblocks = {};
|
|||
*/
|
||||
M.core.dock.init = function() {
|
||||
Y.all(SELECTOR.dockableblock).each(M.core.dock.registerDockableBlock);
|
||||
Y.Global.on(M.core.globalEvents.BLOCK_CONTENT_UPDATED, function(e) {
|
||||
M.core.dock.notifyBlockChange(e.instanceid);
|
||||
}, this);
|
||||
BODY.delegate('click', M.core.dock.dockBlock, SELECTOR.blockmoveto);
|
||||
BODY.delegate('key', M.core.dock.dockBlock, SELECTOR.blockmoveto, 'enter');
|
||||
};
|
||||
|
@ -2207,6 +2210,7 @@ Y.augment(DOCKEDITEM, Y.EventTarget);
|
|||
"event-mouseenter",
|
||||
"event-resize",
|
||||
"escape",
|
||||
"moodle-core-dock-loader"
|
||||
"moodle-core-dock-loader",
|
||||
"moodle-core-event"
|
||||
]
|
||||
});
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -64,6 +64,9 @@ M.core.dock._dockableblocks = {};
|
|||
*/
|
||||
M.core.dock.init = function() {
|
||||
Y.all(SELECTOR.dockableblock).each(M.core.dock.registerDockableBlock);
|
||||
Y.Global.on(M.core.globalEvents.BLOCK_CONTENT_UPDATED, function(e) {
|
||||
M.core.dock.notifyBlockChange(e.instanceid);
|
||||
}, this);
|
||||
BODY.delegate('click', M.core.dock.dockBlock, SELECTOR.blockmoveto);
|
||||
BODY.delegate('key', M.core.dock.dockBlock, SELECTOR.blockmoveto, 'enter');
|
||||
};
|
||||
|
@ -2186,6 +2189,7 @@ Y.augment(DOCKEDITEM, Y.EventTarget);
|
|||
"event-mouseenter",
|
||||
"event-resize",
|
||||
"escape",
|
||||
"moodle-core-dock-loader"
|
||||
"moodle-core-dock-loader",
|
||||
"moodle-core-event"
|
||||
]
|
||||
});
|
||||
|
|
|
@ -52,7 +52,15 @@ M.core.globalEvents = M.core.globalEvents || {
|
|||
* @param formid {string} Id of form with error.
|
||||
* @param elementid {string} Id of element with error.
|
||||
*/
|
||||
FORM_ERROR: "form_error"
|
||||
FORM_ERROR: "form_error",
|
||||
|
||||
/**
|
||||
* This event is triggered when the content of a block has changed
|
||||
*
|
||||
* @event "block_content_updated"
|
||||
* @param instanceid ID of the block instance that was updated
|
||||
*/
|
||||
BLOCK_CONTENT_UPDATED: "block_content_updated"
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
YUI.add("moodle-core-event",function(e,t){var n="moodle-core-event";M.core=M.core||{},M.core.event=M.core.event||{FILTER_CONTENT_UPDATED:"filter-content-updated"},M.core.globalEvents=M.core.globalEvents||{FORM_ERROR:"form_error"};var r={emitFacade:!0,defaultFn:function(e){},preventedFn:function(e){},stoppedFn:function(e){}},i;for(i in M.core.event)M.core.event.hasOwnProperty(i)&&e.getEvent(M.core.event[i])===null&&e.publish(M.core.event[i],r);for(i in M.core.globalEvents)M.core.globalEvents.hasOwnProperty(i)&&e.Global.getEvent(M.core.globalEvents[i])===null&&e.Global.publish(M.core.globalEvents[i],e.merge(r,{broadcast:!0}))},"@VERSION@",{requires:["event-custom"]});
|
||||
YUI.add("moodle-core-event",function(e,t){var n="moodle-core-event";M.core=M.core||{},M.core.event=M.core.event||{FILTER_CONTENT_UPDATED:"filter-content-updated"},M.core.globalEvents=M.core.globalEvents||{FORM_ERROR:"form_error",BLOCK_CONTENT_UPDATED:"block_content_updated"};var r={emitFacade:!0,defaultFn:function(e){},preventedFn:function(e){},stoppedFn:function(e){}},i;for(i in M.core.event)M.core.event.hasOwnProperty(i)&&e.getEvent(M.core.event[i])===null&&e.publish(M.core.event[i],r);for(i in M.core.globalEvents)M.core.globalEvents.hasOwnProperty(i)&&e.Global.getEvent(M.core.globalEvents[i])===null&&e.Global.publish(M.core.globalEvents[i],e.merge(r,{broadcast:!0}))},"@VERSION@",{requires:["event-custom"]});
|
||||
|
|
|
@ -52,7 +52,15 @@ M.core.globalEvents = M.core.globalEvents || {
|
|||
* @param formid {string} Id of form with error.
|
||||
* @param elementid {string} Id of element with error.
|
||||
*/
|
||||
FORM_ERROR: "form_error"
|
||||
FORM_ERROR: "form_error",
|
||||
|
||||
/**
|
||||
* This event is triggered when the content of a block has changed
|
||||
*
|
||||
* @event "block_content_updated"
|
||||
* @param instanceid ID of the block instance that was updated
|
||||
*/
|
||||
BLOCK_CONTENT_UPDATED: "block_content_updated"
|
||||
};
|
||||
|
||||
|
||||
|
|
3
lib/yui/src/dock/js/dock.js
vendored
3
lib/yui/src/dock/js/dock.js
vendored
|
@ -62,6 +62,9 @@ M.core.dock._dockableblocks = {};
|
|||
*/
|
||||
M.core.dock.init = function() {
|
||||
Y.all(SELECTOR.dockableblock).each(M.core.dock.registerDockableBlock);
|
||||
Y.Global.on(M.core.globalEvents.BLOCK_CONTENT_UPDATED, function(e) {
|
||||
M.core.dock.notifyBlockChange(e.instanceid);
|
||||
}, this);
|
||||
BODY.delegate('click', M.core.dock.dockBlock, SELECTOR.blockmoveto);
|
||||
BODY.delegate('key', M.core.dock.dockBlock, SELECTOR.blockmoveto, 'enter');
|
||||
};
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
"event-mouseenter",
|
||||
"event-resize",
|
||||
"escape",
|
||||
"moodle-core-dock-loader"
|
||||
"moodle-core-dock-loader",
|
||||
"moodle-core-event"
|
||||
]
|
||||
},
|
||||
"moodle-core-dock-loader": {
|
||||
|
|
10
lib/yui/src/event/js/event.js
vendored
10
lib/yui/src/event/js/event.js
vendored
|
@ -50,7 +50,15 @@ M.core.globalEvents = M.core.globalEvents || {
|
|||
* @param formid {string} Id of form with error.
|
||||
* @param elementid {string} Id of element with error.
|
||||
*/
|
||||
FORM_ERROR: "form_error"
|
||||
FORM_ERROR: "form_error",
|
||||
|
||||
/**
|
||||
* This event is triggered when the content of a block has changed
|
||||
*
|
||||
* @event "block_content_updated"
|
||||
* @param instanceid ID of the block instance that was updated
|
||||
*/
|
||||
BLOCK_CONTENT_UPDATED: "block_content_updated"
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue