kallithea Changeset - bb8f97bee137

Changeset - bb8f97bee137

Parent rev.

Child rev.

[Not reviewed]

Merge codereview

0 1 0

Marcin Kuzminski - 13 years ago 2012-06-10 18:22:45
marcin@python-works.com

merge with beta

1 file changed with 8 insertions and 3 deletions:

rhodecode/public/js/rhodecode.js

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -409,25 +409,24 @@ var injectInlineForm = function(tr){ @@
 	  while (1){
 		  var n = parent.nextElementSibling;
 		  // next element are comments !
 		  if(YUD.hasClass(n,'inline-comments')){
 			  parent = n;
+		  }
 		  else{
 			  break;
+		  }
+	  }
 	  YUD.insertAfter(form,parent);
 	  YUD.get('text_'+lineno).focus();
 	  var f = YUD.get(form);
 	  var overlay = f.getElementsByClassName('overlay')[0];
 	  var _form = f.getElementsByClassName('inline-form')[0];
 	  form.on('submit',function(e){
 		  YUE.preventDefault(e);
 		  //ajax submit
 		  var text = YUD.get('text_'+lineno).value;
 		  var postData = {
 	            'text':text,
@@ @@ -456,26 +455,32 @@ var injectInlineForm = function(tr){ @@
 		  };
 		  if (YUD.hasClass(overlay,'overlay')){
 			  var w = _form.offsetWidth;
 			  var h = _form.offsetHeight;
 			  YUD.setStyle(overlay,'width',w+'px');
 			  YUD.setStyle(overlay,'height',h+'px');
+		  }
 		  YUD.addClass(overlay, 'submitting');
 		  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){
 	var url = AJAX_COMMENT_DELETE_URL.replace('__COMMENT_ID__',comment_id);
     var postData = {'_method':'delete'};
     var success = function(o){
         var n = YUD.get('comment-tr-'+comment_id);
         var root = n.previousElementSibling.previousElementSibling;
         n.parentNode.removeChild(n);
         // scann nodes, and attach add button to last one
         placeAddButton(root);

0 comments (0 inline, 0 general)