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

MDL-35284 patch empty toolbar crashing TinyMCE

Browse Source
This commit is contained in:
Petr Škoda
2012-09-10 22:10:25 +02:00
parent 29149f981c
commit 5ba3a966f6
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/tinymce/module.js
+14 -4
View File
@@ -25,14 +25,24 @@ M.editor_tinymce = M.editor_tinymce || {};
M.editor_tinymce.editor_options = M.editor_tinymce.options || {};
M.editor_tinymce.filepicker_options = M.editor_tinymce.filepicker_options || {};
M.editor_tinymce.langs_loaded = false;
M.editor_tinymce.initialised = false;
M.editor_tinymce.init_editor = function(Y, editorid, options) {
// Load all language strings for all plugins - we do not use standard TinyMCE lang pack loading!
if (!M.editor_tinymce.langs_loaded) {
if (!M.editor_tinymce.initialised) {
// Load all language strings for all plugins - we do not use standard TinyMCE lang pack loading!
tinymce.ScriptLoader.add(M.cfg.wwwroot + '/lib/editor/tinymce/all_strings.php?elanguage=' + options.language + '&rev=' + options.langrev);
M.editor_tinymce.langs_loaded = true;
// Monkey patch for MDL-35284 - this hack ignores empty toolbars.
tinymce.ui.Toolbar.prototype.oldRenderHTML = tinymce.ui.Toolbar.prototype.renderHTML;
tinymce.ui.Toolbar.prototype.renderHTML = function() {
if (this.controls.length == 0) {
return;
}
return tinymce.ui.Toolbar.prototype.oldRenderHTML.call(this);
};
M.editor_tinymce.initialised = true;
}
M.editor_tinymce.editor_options[editorid] = options;