# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2012-06-10 18:22:45
# Node ID bb8f97bee137a16c82b4a6039a7f47e8ec06cda5
# Parent  1bc579bcd67aeb053dbc509ccf36b792ce544218
# Parent  81c29d269aed708f45a35f44416f445e579a3d51

merge with beta

diff --git a/rhodecode/public/js/rhodecode.js b/rhodecode/public/js/rhodecode.js
--- a/rhodecode/public/js/rhodecode.js
+++ b/rhodecode/public/js/rhodecode.js
@@ -418,7 +418,6 @@ var injectInlineForm = function(tr){
 	  }	  
 	  YUD.insertAfter(form,parent);
 	  
-	  YUD.get('text_'+lineno).focus();
 	  var f = YUD.get(form);
 	  
 	  var overlay = f.getElementsByClassName('overlay')[0];
@@ -465,8 +464,14 @@ var injectInlineForm = function(tr){
 		  
 		  ajaxPOST(submit_url, postData, success);
 	  });
-	  // callbacks
-	  tooltip_activate();
+	  
+	  setTimeout(function(){
+		  // callbacks
+		  tooltip_activate();
+		  MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno, 
+	                         _USERS_AC_DATA, _GROUPS_AC_DATA);
+		  YUD.get('text_'+lineno).focus();
+	  },10)
 };
 
 var deleteComment = function(comment_id){