kallithea Changeset - 4982f5b06e2b

Changeset - 4982f5b06e2b

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-09-23 23:34:09
marcin@python-works.com

Add highlight class for future multiline comments

2 files changed with 19 insertions and 4 deletions:

rhodecode/public/css/style.css

rhodecode/public/js/rhodecode.js

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -4217,100 +4217,113 @@ form.comment-form { @@
 	padding-top:5px;
+}
 .add-another-button {
     margin-left: 10px;
     margin-top: 10px;
     margin-bottom: 10px;
+}
 .comment .buttons {
 	float: right;
 	padding:2px 2px 0px 0px;
+}
 .show-inline-comments{
 	position: relative;
 	top:1px
+}
 /** comment inline form **/
 .comment-inline-form .overlay{
 	display: none;
+}
 .comment-inline-form .overlay.submitting{
 	display:block;
     background: none repeat scroll 0 0 white;
     font-size: 16px;
     opacity: 0.5;
     position: absolute;
     text-align: center;
     vertical-align: top;
+}
 .comment-inline-form .overlay.submitting .overlay-text{
 	width:100%;
 	margin-top:5%;
+}
 .comment-inline-form .clearfix{
     background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 5px;
+}
 div.comment-inline-form {
     margin-top: 5px;
     padding:2px 6px 8px 6px;
+}
     padding:4px 0px 6px 0px;
+}
 tr.hl-comment{
 /*
 	background-color: #FFFFCC !important;
 */
+}
 /*
 tr.hl-comment pre {
 	border-top: 2px solid #FFEE33;
 	border-left: 2px solid #FFEE33;
 	border-right: 2px solid #FFEE33;
+}
 */
 .comment-inline-form strong {
     display: block;
     margin-bottom: 15px;
+}
 .comment-inline-form textarea {
     width: 100%;
     height: 100px;
     font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+}
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help{
     padding: 0px 0px 2px 0px;
     color: #666666;
     font-size: 10px;
+}
 .comment-inline-form .comment-button{
     padding-top:5px;
+}
 /** comment inline **/
 .inline-comments {
     padding:10px 20px;
+}
 .inline-comments div.rst-block  {
 	clear:both;
 	overflow:hidden;

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -372,117 +372,119 @@ var q_filter = function(target,nodes,dis @@
     		   show_node(target_element);
     		   showing+=1;
+    	   }
+       }
 	   // if repo_count is set update the number
 	   var cnt = YUD.get('repo_count');
 	   if(cnt){
 		   YUD.get('repo_count').innerHTML = showing;
+	   }
+	}
 };
 var tableTr = function(cls, body){
 	var _el = document.createElement('div');
 	var cont = new YAHOO.util.Element(body);
 	var comment_id = fromHTML(body).children[0].id.split('comment-')[1];
 	var id = 'comment-tr-{0}'.format(comment_id);
 	var _html = ('<table><tbody><tr id="{0}" class="{1}">'+
 	              '<td class="lineno-inline new-inline"></td>'+
     			  '<td class="lineno-inline old-inline"></td>'+
                   '<td>{2}</td>'+
                  '</tr></tbody></table>').format(id, cls, body);
 	_el.innerHTML = _html;
 	return _el.children[0].children[0].children[0];
 };
 /** comments **/
 var removeInlineForm = function(form) {
 	form.parentNode.removeChild(form);
 };
 var createInlineForm = function(parent_tr, f_path, line) {
 	var tmpl = YUD.get('comment-inline-form-template').innerHTML;
 	tmpl = tmpl.format(f_path, line);
 	var form = tableTr('comment-form-inline',tmpl)
 	// create event for hide button
 	form = new YAHOO.util.Element(form);
 	var form_hide_button = new YAHOO.util.Element(YUD.getElementsByClassName('hide-inline-form',null,form)[0]);
 	form_hide_button.on('click', function(e) {
 		var newtr = e.currentTarget.parentNode.parentNode.parentNode.parentNode.parentNode;
 		if(YUD.hasClass(newtr.nextElementSibling,'inline-comments-button')){
 			YUD.setStyle(newtr.nextElementSibling,'display','');
+		}
 		removeInlineForm(newtr);
 		YUD.removeClass(parent_tr, 'form-open');
 		YUD.removeClass(parent_tr, 'hl-comment');
 	});
 	return form
 };
 /**
  * Inject inline comment for on given TR this tr should be always an .line
  * tr containing the line. Code will detect comment, and always put the comment
  * block at the very bottom
  */
 var injectInlineForm = function(tr){
 	  if(!YUD.hasClass(tr, 'line')){
 		  return
+	  }
 	  var submit_url = AJAX_COMMENT_URL;
 	  var _td = YUD.getElementsByClassName('code',null,tr)[0];
 	  if(YUD.hasClass(tr,'form-open') || YUD.hasClass(tr,'context') || YUD.hasClass(_td,'no-comment')){
 		  return
+	  }
 	  YUD.addClass(tr,'form-open');
 	  YUD.addClass(tr,'hl-comment');
 	  var node = YUD.getElementsByClassName('full_f_path',null,tr.parentNode.parentNode.parentNode)[0];
 	  var f_path = YUD.getAttribute(node,'path');
 	  var lineno = getLineNo(tr);
 	  var form = createInlineForm(tr, f_path, lineno, submit_url);
 	  var parent = 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);
 	  var f = YUD.get(form);
 	  var overlay = YUD.getElementsByClassName('overlay',null,f)[0];
 	  var _form = YUD.getElementsByClassName('inline-form',null,f)[0];
 	  YUE.on(YUD.get(_form), 'submit',function(e){
 		  YUE.preventDefault(e);
 		  //ajax submit
 		  var text = YUD.get('text_'+lineno).value;
 		  var postData = {
 	            'text':text,
 	            'f_path':f_path,
 	            'line':lineno
 		  };
 		  if(lineno === undefined){
 			  alert('missing line !');
 			  return
+		  }
 		  if(f_path === undefined){
 			  alert('missing file path !');
 			  return
+		  }
 		  if(text == ""){
 			  return
+		  }
 		  var success = function(o){
 			  YUD.removeClass(tr, 'form-open');
 			  removeInlineForm(f);

0 comments (0 inline, 0 general)