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

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

Browse source
This commit is contained in:
Sam Hemelryk 2014-01-06 11:22:29 +13:00
commit 9b94e327d3
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js vendored
View file

@ -802,7 +802,7 @@ BLOCKREGION.prototype = {
Y.log('Block region `'+this.get('region')+'` initialising', 'info'); Y.log('Block region `'+this.get('region')+'` initialising', 'info');
if (!node) { if (!node) {
Y.log('block region known about but no HTML structure found for it. Guessing structure.', 'warn'); Y.log('block region known about but no HTML structure found for it. Guessing structure.', 'warn');
this.create_and_add_node(); node = this.create_and_add_node();
} }
var body = Y.one('body'), var body = Y.one('body'),
hasblocks = node.all('.'+CSS.BLOCK).size() > 0, hasblocks = node.all('.'+CSS.BLOCK).size() > 0,
@ -818,6 +818,7 @@ BLOCKREGION.prototype = {
* Creates a generic block region node and adds it to the DOM at the best guess location. * Creates a generic block region node and adds it to the DOM at the best guess location.
* Any calling of this method is an unfortunate circumstance. * Any calling of this method is an unfortunate circumstance.
* @method create_and_add_node * @method create_and_add_node
* @return Node The newly created Node
*/ */
create_and_add_node : function() { create_and_add_node : function() {
var c = Y.Node.create, var c = Y.Node.create,
@ -860,6 +861,8 @@ BLOCKREGION.prototype = {
Y.one('body').append(node); Y.one('body').append(node);
} }
this.set('node', node); this.set('node', node);
return node;
}, },
/** /**

2
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js vendored
View file

File diff suppressed because one or more lines are too long

5
lib/yui/build/moodle-core-blocks/moodle-core-blocks.js vendored
View file

@ -798,7 +798,7 @@ BLOCKREGION.prototype = {
initializer : function() { initializer : function() {
var node = this.get('node'); var node = this.get('node');
if (!node) { if (!node) {
this.create_and_add_node(); node = this.create_and_add_node();
} }
var body = Y.one('body'), var body = Y.one('body'),
hasblocks = node.all('.'+CSS.BLOCK).size() > 0, hasblocks = node.all('.'+CSS.BLOCK).size() > 0,
@ -814,6 +814,7 @@ BLOCKREGION.prototype = {
* Creates a generic block region node and adds it to the DOM at the best guess location. * Creates a generic block region node and adds it to the DOM at the best guess location.
* Any calling of this method is an unfortunate circumstance. * Any calling of this method is an unfortunate circumstance.
* @method create_and_add_node * @method create_and_add_node
* @return Node The newly created Node
*/ */
create_and_add_node : function() { create_and_add_node : function() {
var c = Y.Node.create, var c = Y.Node.create,
@ -856,6 +857,8 @@ BLOCKREGION.prototype = {
Y.one('body').append(node); Y.one('body').append(node);
} }
this.set('node', node); this.set('node', node);
return node;
}, },
/** /**

5
lib/yui/src/blocks/js/blockregion.js vendored
View file

@ -27,7 +27,7 @@ BLOCKREGION.prototype = {
Y.log('Block region `'+this.get('region')+'` initialising', 'info'); Y.log('Block region `'+this.get('region')+'` initialising', 'info');
if (!node) { if (!node) {
Y.log('block region known about but no HTML structure found for it. Guessing structure.', 'warn'); Y.log('block region known about but no HTML structure found for it. Guessing structure.', 'warn');
this.create_and_add_node(); node = this.create_and_add_node();
} }
var body = Y.one('body'), var body = Y.one('body'),
hasblocks = node.all('.'+CSS.BLOCK).size() > 0, hasblocks = node.all('.'+CSS.BLOCK).size() > 0,
@ -43,6 +43,7 @@ BLOCKREGION.prototype = {
* Creates a generic block region node and adds it to the DOM at the best guess location. * Creates a generic block region node and adds it to the DOM at the best guess location.
* Any calling of this method is an unfortunate circumstance. * Any calling of this method is an unfortunate circumstance.
* @method create_and_add_node * @method create_and_add_node
* @return Node The newly created Node
*/ */
create_and_add_node : function() { create_and_add_node : function() {
var c = Y.Node.create, var c = Y.Node.create,
@ -85,6 +86,8 @@ BLOCKREGION.prototype = {
Y.one('body').append(node); Y.one('body').append(node);
} }
this.set('node', node); this.set('node', node);
return node;
}, },
/** /**