From fc20fb17c299100fd39e900f20c70d823baaebdf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 14:21:23 -0800
Subject: force text paste in editor

---
 view/en/jot-header.tpl | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'view/en/jot-header.tpl')

diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index b687f65a6..93eb440a4 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -2,17 +2,20 @@
 <script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
+var editor;
+
 tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
+	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
 	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,
@@ -43,8 +46,13 @@ tinyMCE.init({
 				$('#character-counter').addClass('red');
 			}
 			$('#character-counter').text(text);
-    		});
-     	}
+    	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
+
+	}
 });
 
 </script>
-- 
cgit v1.2.3


From 9d561d4471bccdd199821cd9ce5b2f6354ab8e65 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 31 Jan 2011 23:06:45 -0800
Subject: oembed contsant name, fix dfrnpubdeliver, add 'code' editor button

---
 view/en/jot-header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/en/jot-header.tpl')

diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index 93eb440a4..d0c956a02 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -9,7 +9,7 @@ tinyMCE.init({
 	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,formatselect",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
-- 
cgit v1.2.3