Merge pull request #37 from fabrixxm/master

autocomplete contacts metions

1 files changed, 6 insertions, 3 deletions

diff --git a/js/main.js b/js/main.js
index 03ba11ed8..15c5b5d1f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -78,8 +78,6 @@
 			menu.toggle();
 			return false;
 		});
-		
-		
 
 		/* notifications template */
 		var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
@@ -163,7 +161,9 @@
 				}
 			}
 
-		});					
+		});
+		
+		
 	});
 
 	function NavUpdate() {
@@ -245,6 +245,8 @@
 				commentBusy = false;
 				$('body').css('cursor', 'auto');
 			}
+			/* autocomplete @nicknames */
+			$(".comment-edit-wrapper  textarea").contact_autocomplete(baseurl+"/acl");
 		});
 	}
 
@@ -445,6 +447,7 @@ function setupFieldRichtext(){
 	});
 }
 
+
 /** 
  * sprintf in javascript 
  *	"{0} and {1}".format('zero','uno');