# HG changeset patch
# User Dan
# Date 1203875452 18000
# Node ID 31c23016ab626557ed2f4e786045789b3b8a8de0
# Parent c433348f3628f81e2f16d5956e0aa5323ddb5cfa
Upgraded tinyMCE to 3.0.1 in hopes of fixing IE race conditions. Fixed a couple minor syntax errors in Javascript objects declared in various places.
diff -r c433348f3628 -r 31c23016ab62 includes/clientside/tinymce/plugins/advimage/js/image.js
--- a/includes/clientside/tinymce/plugins/advimage/js/image.js Fri Feb 22 12:51:53 2008 -0500
+++ b/includes/clientside/tinymce/plugins/advimage/js/image.js Sun Feb 24 12:50:52 2008 -0500
@@ -91,8 +91,11 @@
var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];
if (f.src.value === '') {
- ed.dom.remove(ed.selection.getNode());
- ed.execCommand('mceRepaint');
+ if (ed.selection.getNode().nodeName == 'IMG') {
+ ed.dom.remove(ed.selection.getNode());
+ ed.execCommand('mceRepaint');
+ }
+
tinyMCEPopup.close();
return;
}
@@ -165,9 +168,10 @@
if (el && el.nodeName == 'IMG') {
ed.dom.setAttribs(el, args);
} else {
- ed.execCommand('mceInsertContent', false, '');
+ ed.execCommand('mceInsertContent', false, '', {skip_undo : 1});
ed.dom.setAttribs('__mce_tmp', args);
ed.dom.setAttrib('__mce_tmp', 'id', '');
+ ed.undoManager.add();
}
tinyMCEPopup.close();
diff -r c433348f3628 -r 31c23016ab62 includes/clientside/tinymce/plugins/advlink/js/advlink.js
--- a/includes/clientside/tinymce/plugins/advlink/js/advlink.js Fri Feb 22 12:51:53 2008 -0500
+++ b/includes/clientside/tinymce/plugins/advlink/js/advlink.js Sun Feb 24 12:50:52 2008 -0500
@@ -412,7 +412,7 @@
// Create new anchor elements
if (elm == null) {
- tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#");
+ tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
for (i=0; i
';t.head+='\n\n
\n
\n\n
\n