mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2015-09-22 08:15:01 +01:00
commit 74ede2d89a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-debug.js vendored
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 () {

4
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop-min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/yui/build/moodle-core-dragdrop/moodle-core-dragdrop.js vendored
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 () {

2
lib/yui/src/dragdrop/js/dragdrop.js vendored
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 () {