moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle

Browse source
This commit is contained in:
David Monllao 2015-09-01 14:35:18 +08:00
commit eb41f5539e
5 changed files with 40 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

37
lib/yui/build/moodle-core-dock/moodle-core-dock-debug.js vendored
View file

@ -428,7 +428,6 @@ DOCK.prototype = {
Y.delegate('mouseenter', this.handleEvent, this.get('dockNode'), '.'+CSS.dockedtitle, this, mouseenterargs); Y.delegate('mouseenter', this.handleEvent, this.get('dockNode'), '.'+CSS.dockedtitle, this, mouseenterargs);
this.get('dockNode').on('mouseleave', this.handleEvent, this, {cssselector:'#dock', delay:0.5, iscontained:false}); this.get('dockNode').on('mouseleave', this.handleEvent, this, {cssselector:'#dock', delay:0.5, iscontained:false});
Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this);
Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this); Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this);
Y.delegate('dock:actionkey', this.handleDockedItemEvent, this.get('dockNode'), '.'+CSS.dockeditem, this); Y.delegate('dock:actionkey', this.handleDockedItemEvent, this.get('dockNode'), '.'+CSS.dockeditem, this);
@ -1693,8 +1692,7 @@ BLOCK.prototype = {
* @method initializer * @method initializer
*/ */
initializer : function() { initializer : function() {
var node = Y.one('#inst'+this.get('id')), var node = Y.one('#inst'+this.get('id'));
commands;
if (!node) { if (!node) {
return false; return false;
} }
@ -1706,14 +1704,7 @@ BLOCK.prototype = {
// Move the block straight to the dock if required // Move the block straight to the dock if required
if (node.hasClass(CSS.dockonload)) { if (node.hasClass(CSS.dockonload)) {
node.removeClass(CSS.dockonload); node.removeClass(CSS.dockonload);
commands = node.one('.header .title .commands'); this.moveToDock();
if (!commands) {
commands = Y.Node.create('<div class="commands"></div>');
if (node.one('.header .title')) {
node.one('.header .title').append(commands);
}
}
this.moveToDock(null, commands);
} }
this.skipsetposition = false; this.skipsetposition = false;
return true; return true;
@ -1769,8 +1760,15 @@ BLOCK.prototype = {
this.recordBlockState(); this.recordBlockState();
blocktitle = this.cachedcontentnode.one('.title h2').cloneNode(true); blocktitle = this.cachedcontentnode.one('.title h2').cloneNode(true);
blockcommands = this.cachedcontentnode.one('.title .commands').cloneNode(true);
// Build up the block commands.
// These should not actually added to the DOM.
blockcommands = this.cachedcontentnode.one('.title .commands');
if (blockcommands) {
blockcommands = blockcommands.cloneNode(true);
} else {
blockcommands = Y.Node.create('<div class="commands"></div>');
}
movetoimg = Y.Node.create('<img />').setAttrs({ movetoimg = Y.Node.create('<img />').setAttrs({
alt : Y.Escape.html(M.util.get_string('undockitem', 'block')), alt : Y.Escape.html(M.util.get_string('undockitem', 'block')),
title : Y.Escape.html(M.util.get_string('undockblock', 'block', blocktitle.get('innerHTML'))), title : Y.Escape.html(M.util.get_string('undockblock', 'block', blocktitle.get('innerHTML'))),
@ -1821,9 +1819,6 @@ BLOCK.prototype = {
node.replace(this.contentplaceholder); node.replace(this.contentplaceholder);
dock.addToHoldingArea(node); dock.addToHoldingArea(node);
node = null; node = null;
if (!this.cachedcontentnode.one('.title .commands')) {
this.cachedcontentnode.one('.title').append(Y.Node.create('<div class="commands"></div>'));
}
}, },
/** /**
@ -1832,8 +1827,7 @@ BLOCK.prototype = {
* @return {Boolean} * @return {Boolean}
*/ */
returnToPage : function() { returnToPage : function() {
var id = this.get('id'), var id = this.get('id');
commands;
Y.log('Moving block out of the dock:'+this.get('id'), 'debug', LOGNS); Y.log('Moving block out of the dock:'+this.get('id'), 'debug', LOGNS);
@ -1849,15 +1843,8 @@ BLOCK.prototype = {
} }
this.contentplaceholder.replace(this.cachedcontentnode); this.contentplaceholder.replace(this.cachedcontentnode);
this.cachedcontentnode = Y.one('#'+this.cachedcontentnode.get('id'));
commands = this.dockitem.get('commands');
if (commands) {
commands.all('.hidepanelicon').remove();
commands.all('.moveto').remove();
commands.remove();
}
this.cachedcontentnode = null; this.cachedcontentnode = null;
M.util.set_user_preference('docked_block_instance_'+id, 0); M.util.set_user_preference('docked_block_instance_'+id, 0);
this.set('isDocked', false); this.set('isDocked', false);
return true; return true;

8
lib/yui/build/moodle-core-dock/moodle-core-dock-min.js vendored
View file

File diff suppressed because one or more lines are too long

37
lib/yui/build/moodle-core-dock/moodle-core-dock.js vendored
View file

@ -426,7 +426,6 @@ DOCK.prototype = {
Y.delegate('mouseenter', this.handleEvent, this.get('dockNode'), '.'+CSS.dockedtitle, this, mouseenterargs); Y.delegate('mouseenter', this.handleEvent, this.get('dockNode'), '.'+CSS.dockedtitle, this, mouseenterargs);
this.get('dockNode').on('mouseleave', this.handleEvent, this, {cssselector:'#dock', delay:0.5, iscontained:false}); this.get('dockNode').on('mouseleave', this.handleEvent, this, {cssselector:'#dock', delay:0.5, iscontained:false});
Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this);
Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this); Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this);
Y.delegate('dock:actionkey', this.handleDockedItemEvent, this.get('dockNode'), '.'+CSS.dockeditem, this); Y.delegate('dock:actionkey', this.handleDockedItemEvent, this.get('dockNode'), '.'+CSS.dockeditem, this);
@ -1678,8 +1677,7 @@ BLOCK.prototype = {
* @method initializer * @method initializer
*/ */
initializer : function() { initializer : function() {
var node = Y.one('#inst'+this.get('id')), var node = Y.one('#inst'+this.get('id'));
commands;
if (!node) { if (!node) {
return false; return false;
} }
@ -1690,14 +1688,7 @@ BLOCK.prototype = {
// Move the block straight to the dock if required // Move the block straight to the dock if required
if (node.hasClass(CSS.dockonload)) { if (node.hasClass(CSS.dockonload)) {
node.removeClass(CSS.dockonload); node.removeClass(CSS.dockonload);
commands = node.one('.header .title .commands'); this.moveToDock();
if (!commands) {
commands = Y.Node.create('<div class="commands"></div>');
if (node.one('.header .title')) {
node.one('.header .title').append(commands);
}
}
this.moveToDock(null, commands);
} }
this.skipsetposition = false; this.skipsetposition = false;
return true; return true;
@ -1752,8 +1743,15 @@ BLOCK.prototype = {
this.recordBlockState(); this.recordBlockState();
blocktitle = this.cachedcontentnode.one('.title h2').cloneNode(true); blocktitle = this.cachedcontentnode.one('.title h2').cloneNode(true);
blockcommands = this.cachedcontentnode.one('.title .commands').cloneNode(true);
// Build up the block commands.
// These should not actually added to the DOM.
blockcommands = this.cachedcontentnode.one('.title .commands');
if (blockcommands) {
blockcommands = blockcommands.cloneNode(true);
} else {
blockcommands = Y.Node.create('<div class="commands"></div>');
}
movetoimg = Y.Node.create('<img />').setAttrs({ movetoimg = Y.Node.create('<img />').setAttrs({
alt : Y.Escape.html(M.util.get_string('undockitem', 'block')), alt : Y.Escape.html(M.util.get_string('undockitem', 'block')),
title : Y.Escape.html(M.util.get_string('undockblock', 'block', blocktitle.get('innerHTML'))), title : Y.Escape.html(M.util.get_string('undockblock', 'block', blocktitle.get('innerHTML'))),
@ -1804,9 +1802,6 @@ BLOCK.prototype = {
node.replace(this.contentplaceholder); node.replace(this.contentplaceholder);
dock.addToHoldingArea(node); dock.addToHoldingArea(node);
node = null; node = null;
if (!this.cachedcontentnode.one('.title .commands')) {
this.cachedcontentnode.one('.title').append(Y.Node.create('<div class="commands"></div>'));
}
}, },
/** /**
@ -1815,8 +1810,7 @@ BLOCK.prototype = {
* @return {Boolean} * @return {Boolean}
*/ */
returnToPage : function() { returnToPage : function() {
var id = this.get('id'), var id = this.get('id');
commands;
// Enable the skip anchor when going back to block mode // Enable the skip anchor when going back to block mode
@ -1831,15 +1825,8 @@ BLOCK.prototype = {
} }
this.contentplaceholder.replace(this.cachedcontentnode); this.contentplaceholder.replace(this.cachedcontentnode);
this.cachedcontentnode = Y.one('#'+this.cachedcontentnode.get('id'));
commands = this.dockitem.get('commands');
if (commands) {
commands.all('.hidepanelicon').remove();
commands.all('.moveto').remove();
commands.remove();
}
this.cachedcontentnode = null; this.cachedcontentnode = null;
M.util.set_user_preference('docked_block_instance_'+id, 0); M.util.set_user_preference('docked_block_instance_'+id, 0);
this.set('isDocked', false); this.set('isDocked', false);
return true; return true;

36
lib/yui/src/dock/js/block.js vendored
View file

@ -58,8 +58,7 @@ BLOCK.prototype = {
* @method initializer * @method initializer
*/ */
initializer : function() { initializer : function() {
var node = Y.one('#inst'+this.get('id')), var node = Y.one('#inst'+this.get('id'));
commands;
if (!node) { if (!node) {
return false; return false;
} }
@ -71,14 +70,7 @@ BLOCK.prototype = {
// Move the block straight to the dock if required // Move the block straight to the dock if required
if (node.hasClass(CSS.dockonload)) { if (node.hasClass(CSS.dockonload)) {
node.removeClass(CSS.dockonload); node.removeClass(CSS.dockonload);
commands = node.one('.header .title .commands'); this.moveToDock();
if (!commands) {
commands = Y.Node.create('<div class="commands"></div>');
if (node.one('.header .title')) {
node.one('.header .title').append(commands);
}
}
this.moveToDock(null, commands);
} }
this.skipsetposition = false; this.skipsetposition = false;
return true; return true;
@ -134,8 +126,15 @@ BLOCK.prototype = {
this.recordBlockState(); this.recordBlockState();
blocktitle = this.cachedcontentnode.one('.title h2').cloneNode(true); blocktitle = this.cachedcontentnode.one('.title h2').cloneNode(true);
blockcommands = this.cachedcontentnode.one('.title .commands').cloneNode(true);
// Build up the block commands.
// These should not actually added to the DOM.
blockcommands = this.cachedcontentnode.one('.title .commands');
if (blockcommands) {
blockcommands = blockcommands.cloneNode(true);
} else {
blockcommands = Y.Node.create('<div class="commands"></div>');
}
movetoimg = Y.Node.create('<img />').setAttrs({ movetoimg = Y.Node.create('<img />').setAttrs({
alt : Y.Escape.html(M.util.get_string('undockitem', 'block')), alt : Y.Escape.html(M.util.get_string('undockitem', 'block')),
title : Y.Escape.html(M.util.get_string('undockblock', 'block', blocktitle.get('innerHTML'))), title : Y.Escape.html(M.util.get_string('undockblock', 'block', blocktitle.get('innerHTML'))),
@ -186,9 +185,6 @@ BLOCK.prototype = {
node.replace(this.contentplaceholder); node.replace(this.contentplaceholder);
dock.addToHoldingArea(node); dock.addToHoldingArea(node);
node = null; node = null;
if (!this.cachedcontentnode.one('.title .commands')) {
this.cachedcontentnode.one('.title').append(Y.Node.create('<div class="commands"></div>'));
}
}, },
/** /**
@ -197,8 +193,7 @@ BLOCK.prototype = {
* @return {Boolean} * @return {Boolean}
*/ */
returnToPage : function() { returnToPage : function() {
var id = this.get('id'), var id = this.get('id');
commands;
Y.log('Moving block out of the dock:'+this.get('id'), 'debug', LOGNS); Y.log('Moving block out of the dock:'+this.get('id'), 'debug', LOGNS);
@ -214,15 +209,8 @@ BLOCK.prototype = {
} }
this.contentplaceholder.replace(this.cachedcontentnode); this.contentplaceholder.replace(this.cachedcontentnode);
this.cachedcontentnode = Y.one('#'+this.cachedcontentnode.get('id'));
commands = this.dockitem.get('commands');
if (commands) {
commands.all('.hidepanelicon').remove();
commands.all('.moveto').remove();
commands.remove();
}
this.cachedcontentnode = null; this.cachedcontentnode = null;
M.util.set_user_preference('docked_block_instance_'+id, 0); M.util.set_user_preference('docked_block_instance_'+id, 0);
this.set('isDocked', false); this.set('isDocked', false);
return true; return true;

1
lib/yui/src/dock/js/dock.js vendored
View file

@ -426,7 +426,6 @@ DOCK.prototype = {
Y.delegate('mouseenter', this.handleEvent, this.get('dockNode'), '.'+CSS.dockedtitle, this, mouseenterargs); Y.delegate('mouseenter', this.handleEvent, this.get('dockNode'), '.'+CSS.dockedtitle, this, mouseenterargs);
this.get('dockNode').on('mouseleave', this.handleEvent, this, {cssselector:'#dock', delay:0.5, iscontained:false}); this.get('dockNode').on('mouseleave', this.handleEvent, this, {cssselector:'#dock', delay:0.5, iscontained:false});
Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this);
Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this); Y.delegate('click', this.handleReturnToBlock, this.get('dockNode'), SELECTOR.panelmoveto, this);
Y.delegate('dock:actionkey', this.handleDockedItemEvent, this.get('dockNode'), '.'+CSS.dockeditem, this); Y.delegate('dock:actionkey', this.handleDockedItemEvent, this.get('dockNode'), '.'+CSS.dockeditem, this);