Merge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle

moodle · May 28, 2012 · 131bd2f · 131bd2f
2 parents d8a05d8 + a252a14
commit 131bd2f
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/lib/yui/dragdrop/dragdrop.js b/lib/yui/dragdrop/dragdrop.js
@@ -69,14 +69,23 @@ YUI.add('moodle-core-dragdrop', function(Y) {
             return new M.core.exception(e);
         },
 
+        in_group: function(target) {
+            var ret = false;
+            Y.each(this.groups, function(v, k) {
+                if (target._groups[v]) {
+                    ret = true;
+                }
+            }, this);
+            return ret;
+        },
         /*
          * Drag-dropping related functions
          */
         global_drag_start : function(e) {
             // Get our drag object
             var drag = e.target;
-            // Check that drop object belong to correct group
+            // Check that drag object belongs to correct group
-            if (!drag.target.inGroup(this.groups)) {
+            if (!this.in_group(drag)) {
                 return;
             }
             // Set some general styles here
@@ -92,8 +101,8 @@ YUI.add('moodle-core-dragdrop', function(Y) {
 
         global_drag_end : function(e) {
             var drag = e.target;
-            // Check that drop object belong to correct group
+            // Check that drag object belongs to correct group
-            if (!drag.target.inGroup(this.groups)) {
+            if (!this.in_group(drag)) {
                 return;
             }
             //Put our general styles back
@@ -106,8 +115,8 @@ YUI.add('moodle-core-dragdrop', function(Y) {
 
         global_drag_drag : function(e) {
             var drag = e.target;
-            // Check that drop object belong to correct group
+            // Check that drag object belongs to correct group
-            if (!drag.target.inGroup(this.groups)) {
+            if (!this.in_group(drag)) {
                 return;
             }
             //Get the last y point