moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-42401-master' of git://github.com/damyon/moodle

Browse source 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
This commit is contained in:
Dan Poltawski 2013-10-29 14:43:02 +08:00
commit c426631850
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js vendored
View file

@ -3092,10 +3092,10 @@ EDITOR.prototype = {
bodyContent: this.get('body'), bodyContent: this.get('body'),
footerContent: this.get('footer'), footerContent: this.get('footer'),
width: '840px', width: '840px',
visible: true visible: false,
draggable: true
}); });
this.dialogue.centerDialogue();
// Add custom class for styling. // Add custom class for styling.
this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE); this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE);
@ -3111,9 +3111,9 @@ EDITOR.prototype = {
this.refresh_button_state(); this.refresh_button_state();
} }
} else {
this.dialogue.show();
} }
this.dialogue.centerDialogue();
this.dialogue.show();
this.load_all_pages(); this.load_all_pages();
}, },

6
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js vendored
View file

File diff suppressed because one or more lines are too long

8
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js vendored
View file

@ -3092,10 +3092,10 @@ EDITOR.prototype = {
bodyContent: this.get('body'), bodyContent: this.get('body'),
footerContent: this.get('footer'), footerContent: this.get('footer'),
width: '840px', width: '840px',
visible: true visible: false,
draggable: true
}); });
this.dialogue.centerDialogue();
// Add custom class for styling. // Add custom class for styling.
this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE); this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE);
@ -3111,9 +3111,9 @@ EDITOR.prototype = {
this.refresh_button_state(); this.refresh_button_state();
} }
} else {
this.dialogue.show();
} }
this.dialogue.centerDialogue();
this.dialogue.show();
this.load_all_pages(); this.load_all_pages();
}, },

8
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js vendored
View file

@ -279,10 +279,10 @@ EDITOR.prototype = {
bodyContent: this.get('body'), bodyContent: this.get('body'),
footerContent: this.get('footer'), footerContent: this.get('footer'),
width: '840px', width: '840px',
visible: true visible: false,
draggable: true
}); });
this.dialogue.centerDialogue();
// Add custom class for styling. // Add custom class for styling.
this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE); this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE);
@ -298,9 +298,9 @@ EDITOR.prototype = {
this.refresh_button_state(); this.refresh_button_state();
} }
} else {
this.dialogue.show();
} }
this.dialogue.centerDialogue();
this.dialogue.show();
this.load_all_pages(); this.load_all_pages();
}, },