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

MDL-14739: upgrade tinymce from 3.0.9 to 3.2.0.1. This fixes numerous bugs in TinyMCE. Also removed some cruft, removed in previous

Browse Source 
versions of the editor.
This commit is contained in:
scyrma
2008-09-23 04:10:39 +00:00
parent de9601889d
commit c0d551f05f
44 changed files with 1155 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/editor/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
Vendored
+12 -5
View File
@@ -103,8 +103,14 @@
return Event.cancel(e);
},
_insertText : function(content, bLinebreaks) {
_insertText : function(content, bLinebreaks) {
content = this.editor.dom.encode(content);
if (content && content.length > 0) {
// Delete any highlighted text before pasting
if (!this.editor.selection.isCollapsed())
this.editor.execCommand("Delete");
if (bLinebreaks) {
// Special paragraph treatment
if (this.editor.getParam("paste_create_paragraphs", true)) {
@@ -154,8 +160,8 @@
content = content.replace(/\n/g, '<br />');
}
}
this.editor.execCommand("mceInsertRawHTML", false, this.editor.dom.encode(content));
this.editor.execCommand("mceInsertRawHTML", false, content);
}
},
@@ -170,7 +176,7 @@
if (ed.getParam('paste_insert_word_content_callback'))
content = ed.execCallback('paste_insert_word_content_callback', 'before', content);
var rl = ed.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
var rl = ed.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\x93|\x94|\u201c|\u201d,",\x60|\x91|\x92|\u2018|\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
for (var i=0; i<rl.length; i+=2)
content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
@@ -183,7 +189,8 @@
content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
content = content.replace(/<o:p><\/o:p>/gi, "");
content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), ""); // Word comments
content = content.replace(/<!--([\s\S]*?)-->|<style>[\s\S]*?<\/style>/g, ""); // Word comments
content = content.replace(/<(meta|link)[^>]+>/g, ""); // Header elements
if (this.editor.getParam("paste_remove_spans", true))
content = content.replace(/<\/?span[^>]*>/gi, "");