Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle

This commit is contained in:
Eloy Lafuente (stronk7)
2013-09-25 23:48:42 +02:00
2 changed files with 5 additions and 3 deletions
+2 -2
View File
@@ -135,8 +135,8 @@ YUI.add('moodle-course-dragdrop', function(Y) {
var dragnode = drag.get('node');
var dropnode = e.drop.get('node');
// Prepare some variables
var dragnodeid = Number(Y.Moodle.core_course.util.section.getId(dragnode));
var dropnodeid = Number(Y.Moodle.core_course.util.section.getId(dropnode));
var dragnodeid = Y.Moodle.core_course.util.section.getId(dragnode);
var dropnodeid = Y.Moodle.core_course.util.section.getId(dropnode);
var loopstart = dragnodeid;
var loopend = dropnodeid;
+3 -1
View File
@@ -797,7 +797,9 @@ YUI.add('moodle-course-toolboxes', function(Y) {
}
var activityid = Y.Moodle.core_course.util.cm.getId(node);
if (Y.Array.indexOf(response.resourcestotoggle, activityid) != -1) {
// NOTE: resourcestotoggle is returned as a string instead
// of a Number so we must cast our activityid to a String.
if (Y.Array.indexOf(response.resourcestotoggle, "" + activityid) != -1) {
node.getData('toolbox').handle_resource_dim(button, node, oldstatus);
}
}, this);