From aba63f8b78691812cd54e4eddf192cb67b81036b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 27 Mar 2012 15:20:36 -0700
Subject: turn on gecko spellcheck in tinymce

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

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

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index ef760abe0..974e02ab4 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -32,6 +32,7 @@ function initEditor(cb){
 			theme_advanced_toolbar_location : "top",
 			theme_advanced_toolbar_align : "center",
 			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
 			paste_text_sticky : true,
 			entity_encoding : "raw",
 			add_unload_trigger : false,
-- 
cgit v1.2.3


From 7fc57f486fb91da67c190ef8563d872a3570ded6 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 28 Mar 2012 00:44:45 -0700
Subject: support autocomplete @-tags in plaintext mode

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

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

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 974e02ab4..99e3aa0ec 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -11,6 +11,7 @@ function initEditor(cb){
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
 			$("a#jot-perms-icon").fancybox({
 				'transitionIn' : 'elastic',
-- 
cgit v1.2.3


From 0a2675d8b698302e50cb64ce5793ab9d22dee329 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 28 Mar 2012 10:49:34 +0200
Subject: filer: replace "file as" prompt with combobox opened in fancybox

---
 view/jot-header.tpl | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

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

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 99e3aa0ec..67e5eb681 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -264,15 +264,36 @@ function enableOnUser(){
 	}
 
 	function itemFiler(id) {
-		reply = prompt("$fileas");
-		if(reply && reply.length) {
-			commentBusy = true;
-			$('body').css('cursor', 'wait');
-			$.get('filer/' + id + '?term=' + reply);
-			if(timer) clearTimeout(timer);
-			timer = setTimeout(NavUpdate,3000);
-			liking = 1;
-		}
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.fancybox(data);
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.fancybox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
 	}
 
 	function jotClearLocation() {
-- 
cgit v1.2.3