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

Merge branch 'MDL-50563-m28' of https://github.com/NeillM/moodle into MOODLE_28_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2015-07-22 09:37:47 +08:00
parent 52fccfe799 f2d0c4b895
commit 7fa65cdacf
4 changed files with 11 additions and 14 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
+3 -4
View File
@@ -209,6 +209,8 @@ Y.extend(DRAGDROP, Y.Base, {
if (!this.in_group(drag)) {
return;
}
// Store the nodes current style, so we can restore it later.
this.originalstyle = drag.get('node').getAttribute('style');
// Set some general styles here
drag.get('node').setStyle('opacity', '.25');
drag.get('dragNode').setStyles({
@@ -227,10 +229,7 @@ Y.extend(DRAGDROP, Y.Base, {
return;
}
//Put our general styles back
drag.get('node').setStyles({
visibility: '',
opacity: '1'
});
drag.get('node').setAttribute('style', this.originalstyle);
this.drag_end(e);
},
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
+3 -4
View File
@@ -209,6 +209,8 @@ Y.extend(DRAGDROP, Y.Base, {
if (!this.in_group(drag)) {
return;
}
// Store the nodes current style, so we can restore it later.
this.originalstyle = drag.get('node').getAttribute('style');
// Set some general styles here
drag.get('node').setStyle('opacity', '.25');
drag.get('dragNode').setStyles({
@@ -227,10 +229,7 @@ Y.extend(DRAGDROP, Y.Base, {
return;
}
//Put our general styles back
drag.get('node').setStyles({
visibility: '',
opacity: '1'
});
drag.get('node').setAttribute('style', this.originalstyle);
this.drag_end(e);
},
lib/yui/src/dragdrop/js/dragdrop.js
Vendored
+3 -4
View File
@@ -207,6 +207,8 @@ Y.extend(DRAGDROP, Y.Base, {
if (!this.in_group(drag)) {
return;
}
// Store the nodes current style, so we can restore it later.
this.originalstyle = drag.get('node').getAttribute('style');
// Set some general styles here
drag.get('node').setStyle('opacity', '.25');
drag.get('dragNode').setStyles({
@@ -225,10 +227,7 @@ Y.extend(DRAGDROP, Y.Base, {
return;
}
//Put our general styles back
drag.get('node').setStyles({
visibility: '',
opacity: '1'
});
drag.get('node').setAttribute('style', this.originalstyle);
this.drag_end(e);
},