From 0e2fdee20ea4f550f351312e89b50a5e00d68827 Mon Sep 17 00:00:00 2001
From: pixelroot <info@pixelbits.de>
Date: Tue, 13 Nov 2012 16:36:36 +0100
Subject: [PATCH] 	modified:   view/theme/smoothly/jot-header.tpl 
 modified:   view/theme/smoothly/style.css 	modified:  
 view/theme/smoothly/theme.php

---
 view/theme/smoothly/jot-header.tpl | 66 +++++++++++++++++-------------
 view/theme/smoothly/style.css      |  3 +-
 view/theme/smoothly/theme.php      |  2 +-
 3 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl
index b5cfcd9882..0d89c1c6b9 100644
--- a/view/theme/smoothly/jot-header.tpl
+++ b/view/theme/smoothly/jot-header.tpl
@@ -1,22 +1,23 @@
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+
 <script language="javascript" type="text/javascript">
 
 var editor=false;
 var textlen = 0;
 var plaintext = '$editselect';
 
-function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").fancybox({
-                'transitionIn' : 'elastic',
-                'transitionOut' : 'elastic'
-            });
+function initEditor(cb){
+	if (editor==false){
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+            		$(".jothidden").show();
+            		editor = true;
+            		$("a#jot-perms-icon").fancybox({
+                		'transitionIn' : 'elastic',
+                		'transitionOut' : 'elastic'
+            		});
 	                            $("#profile-jot-submit-wrapper").show();
 								{{ if $newpost }}
     	                            $("#profile-upload-wrapper").show();
@@ -32,8 +33,8 @@ function initEditor(cb) {
 								{{ endif }}   
 
 
-            if (typeof cb!="undefined") cb();
-            return;
+			if (typeof cb!="undefined") cb();
+			return;
         }
         tinyMCE.init({
                 theme : "advanced",
@@ -89,7 +90,7 @@ function initEditor(cb) {
                             $('#profile-jot-desc').html('&nbsp;');
                         }
 
-								//Character count
+				//Character count
 
                                 if(textlen <= 140) {
                                         $('#character-counter').removeClass('red');
@@ -140,18 +141,26 @@ function initEditor(cb) {
         if (typeof cb!="undefined") cb();
     }
 } // initEditor
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+
+<script type="text/javascript" src="js/ajaxupload.js" >
 </script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
+
 <script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
+	var ispublic = '$ispublic';
 
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
@@ -164,6 +173,7 @@ function initEditor(cb) {
 				}				 
 			}
 		);
+
 		var file_uploader = new window.AjaxUpload(
 			'wall-file-upload',
 			{ action: 'wall_attach/$nickname',
@@ -328,9 +338,9 @@ function initEditor(cb) {
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
 					$.fancybox.close();
 				} else {
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index ceda263fe5..e9b5683a10 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -2,7 +2,7 @@
   	style.css
   	Smoothly
    
-	Created by alex@friendica.pixelbits.de on 2012-11-12
+	Created by alex@friendica.pixelbits.de on 2012-11-13
 
 ** Colors ** 
 Blue links - #1873a2
@@ -4204,7 +4204,6 @@ div.wall-item-content-wrapper.shiny {
 #profile-upload-wrapper,
 #wall-image-upload-div,
 #wall-file-upload-div,
-
 .hover, 
 .focus {
 	cursor: pointer;
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index a08e9c0da0..3ab7b27133 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -3,7 +3,7 @@
 /*
  * Name: Smoothly
  * Description: Like coffee with milk. Theme works fine with iPad[2].
- * Version: Version 0.11.12
+ * Version: Version 0.11.13
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
  * Screenshot: <a href="screenshot.png">Screenshot</a>
-- 
2.39.5