L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46157-29' of git://github.com/cameron1729/moodle into MOODLE_29_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2015-09-22 08:15:01 +01:00
parent bb126a9b18 c6b86ab0c0
commit 8422607979
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js
Vendored
+1 -1
View File
@@ -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 () {
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js
Vendored
+1 -1
View File
@@ -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 () {
lib/yui/src/dragdrop/js/dragdrop.js
Vendored
+1 -1
View 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 () {