Merge branch 'MDL-40811-master-behat' of https://github.com/andrewnicols/moodle
This commit is contained in:
Vendored
+2
-2
@@ -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;
|
||||
|
||||
Vendored
+3
-1
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user