mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 16:04:25 +02:00
Merge branch 'MDL-42401-master' of git://github.com/damyon/moodle
Conflicts: mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
This commit is contained in:
commit
c426631850
@ -3092,10 +3092,10 @@ EDITOR.prototype = {
|
||||
bodyContent: this.get('body'),
|
||||
footerContent: this.get('footer'),
|
||||
width: '840px',
|
||||
visible: true
|
||||
visible: false,
|
||||
draggable: true
|
||||
});
|
||||
|
||||
this.dialogue.centerDialogue();
|
||||
// Add custom class for styling.
|
||||
this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE);
|
||||
|
||||
@ -3111,9 +3111,9 @@ EDITOR.prototype = {
|
||||
|
||||
this.refresh_button_state();
|
||||
}
|
||||
} else {
|
||||
this.dialogue.show();
|
||||
}
|
||||
this.dialogue.centerDialogue();
|
||||
this.dialogue.show();
|
||||
|
||||
this.load_all_pages();
|
||||
},
|
||||
|
File diff suppressed because one or more lines are too long
@ -3092,10 +3092,10 @@ EDITOR.prototype = {
|
||||
bodyContent: this.get('body'),
|
||||
footerContent: this.get('footer'),
|
||||
width: '840px',
|
||||
visible: true
|
||||
visible: false,
|
||||
draggable: true
|
||||
});
|
||||
|
||||
this.dialogue.centerDialogue();
|
||||
// Add custom class for styling.
|
||||
this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE);
|
||||
|
||||
@ -3111,9 +3111,9 @@ EDITOR.prototype = {
|
||||
|
||||
this.refresh_button_state();
|
||||
}
|
||||
} else {
|
||||
this.dialogue.show();
|
||||
}
|
||||
this.dialogue.centerDialogue();
|
||||
this.dialogue.show();
|
||||
|
||||
this.load_all_pages();
|
||||
},
|
||||
|
@ -279,10 +279,10 @@ EDITOR.prototype = {
|
||||
bodyContent: this.get('body'),
|
||||
footerContent: this.get('footer'),
|
||||
width: '840px',
|
||||
visible: true
|
||||
visible: false,
|
||||
draggable: true
|
||||
});
|
||||
|
||||
this.dialogue.centerDialogue();
|
||||
// Add custom class for styling.
|
||||
this.dialogue.get('boundingBox').addClass(CSS.DIALOGUE);
|
||||
|
||||
@ -298,9 +298,9 @@ EDITOR.prototype = {
|
||||
|
||||
this.refresh_button_state();
|
||||
}
|
||||
} else {
|
||||
this.dialogue.show();
|
||||
}
|
||||
this.dialogue.centerDialogue();
|
||||
this.dialogue.show();
|
||||
|
||||
this.load_all_pages();
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user