MDL-46157 drag and drop: Improve item labels
authorCameron Ball <cameron@moodle.com>
Tue, 8 Sep 2015 03:33:24 +0000 (11:33 +0800)
committerCameron Ball <cameron@moodle.com>
Tue, 8 Sep 2015 03:33:24 +0000 (11:33 +0800)
Ignore the edit menu when determining the region to drag.

lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js
lib/yui/src/dragdrop/js/dragdrop.js

index 47fc0f6..d979ca0 100644 (file)
Binary files a/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js and b/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js differ
index 27dec90..1e72909 100644 (file)
Binary files a/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js and b/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js differ
index 47fc0f6..d979ca0 100644 (file)
Binary files a/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js and b/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js differ
index e7700d0..55d6ca4 100644 (file)
@@ -337,7 +337,7 @@ Y.extend(DRAGDROP, Y.Base, {
      */
     find_element_text: function(n) {
         // The valid node types to get text from.
-        var nodes = n.all('h2, h3, h4, h5, span, p, div.no-overflow, div.dimmed_text');
+        var nodes = n.all('h2, h3, h4, h5, span:not(.actions):not(.menu-action-text), p, div.no-overflow, div.dimmed_text');
         var text = '';
 
         nodes.each(function () {