Merge branch 'MDL-46157-master' of git://github.com/cameron1729/moodle

moodle · Sep 22, 2015 · 74ede2d · 74ede2d
2 parents a32cd74 + 9b5882d
commit 74ede2d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js b/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js
@@ -339,7 +339,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 () {

diff --git a/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js b/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
diff --git a/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js b/lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js
@@ -339,7 +339,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 () {

diff --git a/lib/yui/src/dragdrop/js/dragdrop.js b/lib/yui/src/dragdrop/js/dragdrop.js
@@ -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 () {