Merge branch 'MDL-43281-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
This commit is contained in:
@@ -802,7 +802,7 @@ BLOCKREGION.prototype = {
|
||||
Y.log('Block region `'+this.get('region')+'` initialising', 'info');
|
||||
if (!node) {
|
||||
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'),
|
||||
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.
|
||||
* Any calling of this method is an unfortunate circumstance.
|
||||
* @method create_and_add_node
|
||||
* @return Node The newly created Node
|
||||
*/
|
||||
create_and_add_node : function() {
|
||||
var c = Y.Node.create,
|
||||
@@ -860,6 +861,8 @@ BLOCKREGION.prototype = {
|
||||
Y.one('body').append(node);
|
||||
}
|
||||
this.set('node', node);
|
||||
|
||||
return node;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
File diff suppressed because one or more lines are too long
+4
-1
@@ -798,7 +798,7 @@ BLOCKREGION.prototype = {
|
||||
initializer : function() {
|
||||
var node = this.get('node');
|
||||
if (!node) {
|
||||
this.create_and_add_node();
|
||||
node = this.create_and_add_node();
|
||||
}
|
||||
var body = Y.one('body'),
|
||||
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.
|
||||
* Any calling of this method is an unfortunate circumstance.
|
||||
* @method create_and_add_node
|
||||
* @return Node The newly created Node
|
||||
*/
|
||||
create_and_add_node : function() {
|
||||
var c = Y.Node.create,
|
||||
@@ -856,6 +857,8 @@ BLOCKREGION.prototype = {
|
||||
Y.one('body').append(node);
|
||||
}
|
||||
this.set('node', node);
|
||||
|
||||
return node;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Vendored
+4
-1
@@ -27,7 +27,7 @@ BLOCKREGION.prototype = {
|
||||
Y.log('Block region `'+this.get('region')+'` initialising', 'info');
|
||||
if (!node) {
|
||||
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'),
|
||||
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.
|
||||
* Any calling of this method is an unfortunate circumstance.
|
||||
* @method create_and_add_node
|
||||
* @return Node The newly created Node
|
||||
*/
|
||||
create_and_add_node : function() {
|
||||
var c = Y.Node.create,
|
||||
@@ -85,6 +86,8 @@ BLOCKREGION.prototype = {
|
||||
Y.one('body').append(node);
|
||||
}
|
||||
this.set('node', node);
|
||||
|
||||
return node;
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user