L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-43281-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2014-01-06 11:21:42 +13:00
parent bf78d33216 0660624e26
commit 8a89a476e7
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js
Vendored
+5 -1
View File
@@ -801,7 +801,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,
@@ -817,6 +817,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,
@@ -859,6 +860,8 @@ BLOCKREGION.prototype = {
Y.one('body').append(node);
}
this.set('node', node);
return node;
},
/**
@@ -989,6 +992,7 @@ Y.extend(BLOCKREGION, Y.Base, BLOCKREGION.prototype, {
}
});
}, '@VERSION@', {
"requires": [
"base",
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/yui/build/moodle-core-blocks/moodle-core-blocks.js
Vendored
+5 -1
View File
@@ -797,7 +797,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,
@@ -813,6 +813,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,
@@ -855,6 +856,8 @@ BLOCKREGION.prototype = {
Y.one('body').append(node);
}
this.set('node', node);
return node;
},
/**
@@ -985,6 +988,7 @@ Y.extend(BLOCKREGION, Y.Base, BLOCKREGION.prototype, {
}
});
}, '@VERSION@', {
"requires": [
"base",
lib/yui/src/blocks/js/blockregion.js
Vendored
+5 -2
View File
@@ -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;
},
/**
@@ -213,4 +216,4 @@ Y.extend(BLOCKREGION, Y.Base, BLOCKREGION.prototype, {
}
}
}
});
});