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

Merge branch 'MDL-54890-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2016-06-13 20:09:29 +02:00
parent 112b98def7 014c45b7ac
commit 2c478380d8
7 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-debug.js
Vendored
-1
View File
@@ -347,7 +347,6 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
break;
case 'move':
case 'update':
case 'duplicate':
case 'assignroles':
break;
default:
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes.js
Vendored
-1
View File
@@ -347,7 +347,6 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
break;
case 'move':
case 'update':
case 'duplicate':
case 'assignroles':
break;
default:
course/yui/src/toolboxes/js/resource.js
Vendored
-1
View File
@@ -143,7 +143,6 @@ Y.extend(RESOURCETOOLBOX, TOOLBOX, {
break;
case 'move':
case 'update':
case 'duplicate':
case 'assignroles':
break;
default:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
Vendored
+1 -1
View File
@@ -2538,7 +2538,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
drawable.store_position(container, position.x, position.y);
drawable.nodes.push(container);
node.set('value', this.rawtext);
scrollheight = node.get('scrollHeight'),
scrollheight = node.get('scrollHeight');
node.setStyles({
'height' : scrollheight + 'px',
'overflow': 'hidden'
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
Vendored
+1 -1
View File
@@ -2538,7 +2538,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
drawable.store_position(container, position.x, position.y);
drawable.nodes.push(container);
node.set('value', this.rawtext);
scrollheight = node.get('scrollHeight'),
scrollheight = node.get('scrollHeight');
node.setStyles({
'height' : scrollheight + 'px',
'overflow': 'hidden'
mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
Vendored
+1 -1
View File
@@ -196,7 +196,7 @@ var COMMENT = function(editor, gradeid, pageno, x, y, width, colour, rawtext) {
drawable.store_position(container, position.x, position.y);
drawable.nodes.push(container);
node.set('value', this.rawtext);
scrollheight = node.get('scrollHeight'),
scrollheight = node.get('scrollHeight');
node.setStyles({
'height' : scrollheight + 'px',
'overflow': 'hidden'