From a6292dd0fecd4482fe863ed849d126b5281b1a8a Mon Sep 17 00:00:00 2001 From: hukl Date: Wed, 9 Sep 2009 12:07:57 +0200 Subject: huge tiny_mce update - now using the tiny_mce jquery build which allows tiny_mce to be initialized via jquery - great! --- public/javascripts/tiny_mce/themes/advanced/js/about.js | 0 public/javascripts/tiny_mce/themes/advanced/js/anchor.js | 0 public/javascripts/tiny_mce/themes/advanced/js/charmap.js | 0 .../javascripts/tiny_mce/themes/advanced/js/color_picker.js | 0 public/javascripts/tiny_mce/themes/advanced/js/image.js | 0 public/javascripts/tiny_mce/themes/advanced/js/link.js | 11 ++++++----- .../javascripts/tiny_mce/themes/advanced/js/source_editor.js | 4 ++-- 7 files changed, 8 insertions(+), 7 deletions(-) mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/about.js mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/anchor.js mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/charmap.js mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/color_picker.js mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/image.js mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/link.js mode change 100755 => 100644 public/javascripts/tiny_mce/themes/advanced/js/source_editor.js (limited to 'public/javascripts/tiny_mce/themes/advanced/js') diff --git a/public/javascripts/tiny_mce/themes/advanced/js/about.js b/public/javascripts/tiny_mce/themes/advanced/js/about.js old mode 100755 new mode 100644 diff --git a/public/javascripts/tiny_mce/themes/advanced/js/anchor.js b/public/javascripts/tiny_mce/themes/advanced/js/anchor.js old mode 100755 new mode 100644 diff --git a/public/javascripts/tiny_mce/themes/advanced/js/charmap.js b/public/javascripts/tiny_mce/themes/advanced/js/charmap.js old mode 100755 new mode 100644 diff --git a/public/javascripts/tiny_mce/themes/advanced/js/color_picker.js b/public/javascripts/tiny_mce/themes/advanced/js/color_picker.js old mode 100755 new mode 100644 diff --git a/public/javascripts/tiny_mce/themes/advanced/js/image.js b/public/javascripts/tiny_mce/themes/advanced/js/image.js old mode 100755 new mode 100644 diff --git a/public/javascripts/tiny_mce/themes/advanced/js/link.js b/public/javascripts/tiny_mce/themes/advanced/js/link.js old mode 100755 new mode 100644 index 2974878..f67a5bc --- a/public/javascripts/tiny_mce/themes/advanced/js/link.js +++ b/public/javascripts/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) { @@ -62,8 +63,8 @@ var LinkDialog = { ed.dom.setAttribs(e, { href : f.href.value, title : f.linktitle.value, - target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, - 'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null + target : f.target_list ? getSelectValue(f, "target_list") : null, + 'class' : f.class_list ? getSelectValue(f, "class_list") : null }); } }); @@ -71,8 +72,8 @@ var LinkDialog = { ed.dom.setAttribs(e, { href : f.href.value, title : f.linktitle.value, - target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, - 'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null + target : f.target_list ? getSelectValue(f, "target_list") : null, + 'class' : f.class_list ? getSelectValue(f, "class_list") : null }); } @@ -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/public/javascripts/tiny_mce/themes/advanced/js/source_editor.js b/public/javascripts/tiny_mce/themes/advanced/js/source_editor.js old mode 100755 new mode 100644 index af2231c..2793286 --- a/public/javascripts/tiny_mce/themes/advanced/js/source_editor.js +++ b/public/javascripts/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'); -- cgit v1.3