Skip to content

Commit

Permalink
Merge branch 'MDL-43152-26' of git://github.com/andrewnicols/moodle i…
Browse files Browse the repository at this point in the history
…nto MOODLE_26_STABLE
  • Loading branch information
Sam Hemelryk committed Dec 9, 2013
2 parents f37e3f3 + d33dffe commit 8eb717f
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ Y.extend(TREE, Y.Base, TREE.prototype, {
instance : {
value : false,
setter : function(val) {
return parseInt(val);
return parseInt(val, 10);
}
}
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ Y.extend(TREE, Y.Base, TREE.prototype, {
instance : {
value : false,
setter : function(val) {
return parseInt(val);
return parseInt(val, 10);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/navigation/yui/src/navigation/js/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ Y.extend(TREE, Y.Base, TREE.prototype, {
instance : {
value : false,
setter : function(val) {
return parseInt(val);
return parseInt(val, 10);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {

// See if we are missing either of block regions,
// if yes we need to add an empty one to use as target
if (blockregionlist.size() != this.get('regions').length) {
if (blockregionlist.size() !== this.get('regions').length) {
var blockregion = Y.Node.create('<div></div>')
.addClass(CSS.BLOCKREGION);
var regioncontent = Y.Node.create('<div></div>')
Expand All @@ -90,7 +90,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
// Setting blockregion as droptarget (the case when it is empty)
// The region-post (the right one)
// is very narrow, so add extra padding on the left to drop block on it.
var tar = new Y.DD.Drop({
new Y.DD.Drop({
node: blockregionnode.one('div.'+CSS.REGIONCONTENT),
groups: this.groups,
padding: '40 240 40 240'
Expand Down Expand Up @@ -199,7 +199,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
// Moving from empty region-content towards the opposite one,
// hide empty one (only for region-pre, region-post areas at the moment).
regionname = this.get_region_id(drop.ancestor('div.'+CSS.BLOCKREGION));
if (this.dragsourceregion.all('.'+CSS.BLOCK).size() == 0 && this.dragsourceregion.get('id').match(/(region-pre|region-post)/i)) {
if (this.dragsourceregion.all('.'+CSS.BLOCK).size() === 0 && this.dragsourceregion.get('id').match(/(region-pre|region-post)/i)) {
if (!documentbody.hasClass('side-'+regionname+'-only')) {
documentbody.addClass('side-'+regionname+'-only');
}
Expand Down
Loading

0 comments on commit 8eb717f

Please sign in to comment.