bug #324 - tinymce used for mail even if editplain being used.

1 files changed, 31 insertions, 48 deletions

diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index a74154c19..b5c78345a 100755
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -2,55 +2,38 @@
 <script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    	});
+var plaintext = '$editselect';
 
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-	}
-});
+if(plaintext != 'none') {
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "specific_textareas",
+		editor_selector: /(profile-jot-text|prvmail-text)/,
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		force_p_newlines : false,
+		force_br_newlines : true,
+		forced_root_block : '',
+		convert_urls: false,
+		content_css: "$baseurl/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+			});
+		}
+	});
+}
 
 </script>
 <script type="text/javascript" src="js/ajaxupload.js" ></script>