mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-05-19 13:00:34 +01:00
commit 5d84a61419
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/editor/tinymce/module.js
View File

@ -45,7 +45,6 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
M.editor_tinymce.initialised = true;
M.util.js_pending('editors');
options.oninit = "M.editor_tinymce.init_callback";
options.onchange_callback = "M.editor_tinymce.onchange_callback";
}
M.editor_tinymce.editor_options[editorid] = options;
@ -93,12 +92,6 @@ M.editor_tinymce.init_callback = function() {
M.util.js_complete('editors');
}
M.editor_tinymce.onchange_callback = function(editorinstance) {
// We need to keep the underlying textarea in sync so that when the form
// validator is triggered, it has the value property up-to-date.
editorinstance.save();
};
M.editor_tinymce.init_filepicker = function(Y, editorid, options) {
M.editor_tinymce.filepicker_options[editorid] = options;
};

3
lib/formslib.php
View File

@ -2316,6 +2316,9 @@ var skipClientValidation = false;
} catch(e) {
return true;
}
if (typeof window.tinyMCE !== \'undefined\') {
window.tinyMCE.triggerSave();
}
if (!myValidator()) {
ev.preventDefault();
}