- Updated TinyMCE to 3.2.3 version

3 files changed, 5 insertions, 4 deletions

diff --git a/program/js/tiny_mce/themes/advanced/js/about.js b/program/js/tiny_mce/themes/advanced/js/about.js
index 9081e1ddc..5cee9ed86 100644
--- a/program/js/tiny_mce/themes/advanced/js/about.js
+++ b/program/js/tiny_mce/themes/advanced/js/about.js
@@ -7,7 +7,7 @@ function init() {
 	ed = tinyMCEPopup.editor;

 

 	// Give FF some time

-	window.setTimeout('insertHelpIFrame();', 10);

+	window.setTimeout(insertHelpIFrame, 10);

 

 	tcont = document.getElementById('plugintablecontainer');

 	document.getElementById('plugins_tab').style.display = 'none';

diff --git a/program/js/tiny_mce/themes/advanced/js/link.js b/program/js/tiny_mce/themes/advanced/js/link.js
index 2974878e1..21aae6cbf 100644
--- a/program/js/tiny_mce/themes/advanced/js/link.js
+++ b/program/js/tiny_mce/themes/advanced/js/link.js
@@ -53,6 +53,7 @@ var LinkDialog = {
 

 		// Create new anchor elements

 		if (e == null) {

+			ed.getDoc().execCommand("unlink", false, null);

 			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

 

 			tinymce.each(ed.dom.select("a"), function(n) {

@@ -92,7 +93,7 @@ var LinkDialog = {
 		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))

 			n.value = 'mailto:' + n.value;

 

-		if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))

+		if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))

 			n.value = 'http://' + n.value;

 	},

 

diff --git a/program/js/tiny_mce/themes/advanced/js/source_editor.js b/program/js/tiny_mce/themes/advanced/js/source_editor.js
index af2231cad..279328614 100644
--- a/program/js/tiny_mce/themes/advanced/js/source_editor.js
+++ b/program/js/tiny_mce/themes/advanced/js/source_editor.js
@@ -2,7 +2,7 @@ tinyMCEPopup.requireLangPack();
 tinyMCEPopup.onInit.add(onLoadInit);

 

 function saveContent() {

-	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value);

+	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value, {source_view : true});

 	tinyMCEPopup.close();

 }

 

@@ -13,7 +13,7 @@ function onLoadInit() {
 	if (tinymce.isGecko)

 		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");

 

-	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent();

+	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true});

 

 	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {

 		setWrap('soft');