Changeset - 04aa0ea1ddd0
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Dies Koper - 13 years ago 2012-08-21 06:11:22
diesk@fast.au.fujitsu.com
fixed comment addition and deletion functionality on IE9
2 files changed with 16 insertions and 10 deletions:
rhodecode/public/js/rhodecode.js
10
10
rhodecode/templates/changeset/changeset.html
6
0 comments (0 inline, 0 general)
rhodecode/public/js/rhodecode.js
➞
Show inline comments
 
@@ -377,99 +377,99 @@ var tableTr = function(cls,body){
 
	YUD.addClass(tr, cls);
 
 
 
	var cont = new YAHOO.util.Element(body);
 
	var comment_id = fromHTML(body).children[0].id.split('comment-')[1];
 
	tr.id = 'comment-tr-{0}'.format(comment_id);
 
	tr.innerHTML = '<td class="lineno-inline new-inline"></td>'+
 
    				 '<td class="lineno-inline old-inline"></td>'+
 
                     '<td>{0}</td>'.format(body);
 
	return tr;
 
};
 

			




	
	
	
		
 
/** 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(form.getElementsByClassName('hide-inline-form')[0]);

			




	
	
	
		
 
	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');

			




	
	
	
		
 
		

			




	
	
	
		
 
	});

			




	
	
	
		
 
	

			




	
	
	
		
 
	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 = tr.getElementsByClassName('code')[0];

			




	
	
	
		
 
	  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');

			




	
	
	
		
 
	  var node = tr.parentNode.parentNode.parentNode.getElementsByClassName('full_f_path')[0];

			




	
	
	
		
 
	  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 = f.getElementsByClassName('overlay')[0];

			




	
	
	
		
 
	  var _form = f.getElementsByClassName('inline-form')[0];

			




	
	
	
		
 
	  var overlay = YUD.getElementsByClassName('overlay',null,f)[0];

			




	
	
	
		
 
	  var _form = YUD.getElementsByClassName('inline-form',null,f)[0];

			




	
	
	
		
 
	  

			




	
	
	
		
 
	  form.on('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

			




	
	
	
		
 
		  }

			




	
	
		
 
@@ -547,63 +547,63 @@ var getLineNo = function(tr) {

			




	
	
	
		
 
	var line;

			




	
	
	
		
 
	var o = tr.children[0].id.split('_');

			




	
	
	
		
 
	var n = tr.children[1].id.split('_');

			




	
	
	
		
 

			




	
	
	
		
 
	if (n.length >= 2) {

			




	
	
	
		
 
		line = n[n.length-1];

			




	
	
	
		
 
	} else if (o.length >= 2) {

			




	
	
	
		
 
		line = o[o.length-1];

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	return line

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var placeAddButton = function(target_tr){

			




	
	
	
		
 
	if(!target_tr){

			




	
	
	
		
 
		return

			




	
	
	
		
 
	}

			




	
	
	
		
 
	var last_node = target_tr;

			




	
	
	
		
 
    //scann	

			




	
	
	
		
 
	  while (1){

			




	
	
	
		
 
		  var n = last_node.nextElementSibling;

			




	
	
	
		
 
		  // next element are comments !

			




	
	
	
		
 
		  if(YUD.hasClass(n,'inline-comments')){

			




	
	
	
		
 
			  last_node = n;

			




	
	
	
		
 
			  //also remove the comment button from previos

			




	
	
	
		
 
			  var comment_add_buttons = last_node.getElementsByClassName('add-comment');

			




	
	
	
		
 
			  //also remove the comment button from previous

			




	
	
	
		
 
			  var comment_add_buttons = YUD.getElementsByClassName('add-comment',null,last_node);

			




	
	
	
		
 
			  for(var i=0;i<comment_add_buttons.length;i++){

			




	
	
	
		
 
				  var b = comment_add_buttons[i];

			




	
	
	
		
 
				  b.parentNode.removeChild(b);

			




	
	
	
		
 
			  }

			




	
	
	
		
 
		  }

			




	
	
	
		
 
		  else{

			




	
	
	
		
 
			  break;

			




	
	
	
		
 
		  }

			




	
	
	
		
 
	  }

			




	
	
	
		
 
	  

			




	
	
	
		
 
    var add = createInlineAddButton(target_tr);

			




	
	
	
		
 
    // get the comment div

			




	
	
	
		
 
    var comment_block = last_node.getElementsByClassName('comment')[0];

			




	
	
	
		
 
    var comment_block = YUD.getElementsByClassName('comment',null,last_node)[0];

			




	
	
	
		
 
    // attach add button

			




	
	
	
		
 
    YUD.insertAfter(add,comment_block);	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Places the inline comment into the changeset block in proper line position

			




	
	
	
		
 
 */

			




	
	
	
		
 
var placeInline = function(target_container,lineno,html){

			




	
	
	
		
 
	  var lineid = "{0}_{1}".format(target_container,lineno);

			




	
	
	
		
 
	  var target_line = YUD.get(lineid);

			




	
	
	
		
 
	  var comment = new YAHOO.util.Element(tableTr('inline-comments',html))

			




	
	
	
		
 
	  

			




	
	
	
		
 
	  // check if there are comments already !

			




	
	
	
		
 
	  var parent = target_line.parentNode;

			




	
	
	
		
 
	  var root_parent = parent;

			




	
	
	
		
 
	  while (1){

			




	
	
	
		
 
		  var n = parent.nextElementSibling;

			




	
	
	
		
 
		  // next element are comments !

			




	
	
	
		
 
		  if(YUD.hasClass(n,'inline-comments')){

			




	
	
	
		
 
			  parent = n;

			




	
	
	
		
 
		  }

			




	
	
	
		
 
		  else{

			




	
	
	
		
 
			  break;

			




	
	
	
		
 
		  }

			




	
	
		
 
@@ -868,49 +868,49 @@ var  getSelectionLink = function(selecti

			




	
	
	
		
 
var deleteNotification = function(url, notification_id,callbacks){

			




	
	
	
		
 
    var callback = { 

			




	
	
	
		
 
		success:function(o){

			




	
	
	
		
 
		    var obj = YUD.get(String("notification_"+notification_id));

			




	
	
	
		
 
		    if(obj.parentNode !== undefined){

			




	
	
	
		
 
				obj.parentNode.removeChild(obj);

			




	
	
	
		
 
			}

			




	
	
	
		
 
			_run_callbacks(callbacks);

			




	
	
	
		
 
		},

			




	
	
	
		
 
	    failure:function(o){

			




	
	
	
		
 
	        alert("error");

			




	
	
	
		
 
	    },

			




	
	
	
		
 
	};

			




	
	
	
		
 
    var postData = '_method=delete';

			




	
	
	
		
 
    var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);

			




	
	
	
		
 
    var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, 

			




	
	
	
		
 
    											  callback, postData);

			




	
	
	
		
 
};	

			




	
	
	
		
 

			




	
	
	
		
 
var readNotification = function(url, notification_id,callbacks){

			




	
	
	
		
 
    var callback = { 

			




	
	
	
		
 
		success:function(o){

			




	
	
	
		
 
		    var obj = YUD.get(String("notification_"+notification_id));

			




	
	
	
		
 
		    YUD.removeClass(obj, 'unread');

			




	
	
	
		
 
		    var r_button = obj.children[0].getElementsByClassName('read-notification')[0]

			




	
	
	
		
 
		    var r_button = YUD.getElementsByClassName('read-notification',null,obj.children[0])[0];

			




	
	
	
		
 
		    

			




	
	
	
		
 
		    if(r_button.parentNode !== undefined){

			




	
	
	
		
 
		    	r_button.parentNode.removeChild(r_button);

			




	
	
	
		
 
			}		    

			




	
	
	
		
 
			_run_callbacks(callbacks);

			




	
	
	
		
 
		},

			




	
	
	
		
 
	    failure:function(o){

			




	
	
	
		
 
	        alert("error");

			




	
	
	
		
 
	    },

			




	
	
	
		
 
	};

			




	
	
	
		
 
    var postData = '_method=put';

			




	
	
	
		
 
    var sUrl = url.replace('__NOTIFICATION_ID__',notification_id);

			




	
	
	
		
 
    var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, 

			




	
	
	
		
 
    											  callback, postData);

			




	
	
	
		
 
};	

			




	
	
	
		
 

			




	
	
	
		
 
/** MEMBERS AUTOCOMPLETE WIDGET **/

			




	
	
	
		
 

			




	
	
	
		
 
var MembersAutoComplete = function (users_list, groups_list) {

			




	
	
	
		
 
    var myUsers = users_list;

			




	
	
	
		
 
    var myGroups = groups_list;

			




	
	
	
		
 

			




	
	
	
		
 
    // Define a custom search function for the DataSource of users

			




	
	
	
		
 
    var matchUsers = function (sQuery) {

			




	
	
		
 
@@ -1716,25 +1716,25 @@ var MultiSelectWidget = function(selecte

			




	
	
	
		
 
	        available.options.length = 0;

			




	
	
	
		
 
	    }

			




	
	
	
		
 
	    //remove all elements

			




	
	
	
		
 
	    if(this.id=='remove_all_elements'){

			




	
	
	
		
 
	        for(var i=0; node = choosen.options[i];i++){

			




	
	
	
		
 
	            available.appendChild(new Option(node.text,

			




	
	
	
		
 
	                    node.value, false, false));

			




	
	
	
		
 
	        }

			




	
	
	
		
 
	        choosen.options.length = 0;

			




	
	
	
		
 
	    }

			




	
	
	
		
 
	

			




	
	
	
		
 
	}

			




	
	
	
		
 
	

			




	
	
	
		
 
	YUE.addListener(['add_element','remove_element',

			




	
	
	
		
 
	               'add_all_elements','remove_all_elements'],'click',

			




	
	
	
		
 
	               prompts_action_callback)

			




	
	
	
		
 
	if (form_id !== undefined) {

			




	
	
	
		
 
		YUE.addListener(form_id,'submit',function(){

			




	
	
	
		
 
		    var choosen = YUD.get(selected_container);

			




	
	
	
		
 
		    for (var i = 0; i < choosen.options.length; i++) {

			




	
	
	
		
 
		        choosen.options[i].selected = 'selected';

			




	
	
	
		
 
		    }

			




	
	
	
		
 
		});

			




	
	
	
		
 
	}

			




	
	
	
		
 
}

			




	
	
		
 
\ No newline at end of file

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -128,52 +128,58 @@

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes)}

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## main comment form and it status

			




	
	
	
		
 
    ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id),

			




	
	
	
		
 
                       h.changeset_status(c.rhodecode_db_repo, c.changeset.raw_id))}

			




	
	
	
		
 

			




	
	
	
		
 
    ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 
          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target == null){

			




	
	
	
		
 
                  target = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = YUD.getAttribute(target,'id_for');

			




	
	
	
		
 
              var comments = YUQ('#{0} .inline-comments'.format(boxid));

			




	
	
	
		
 
              for(c in comments){

			




	
	
	
		
 
                 YUD.setStyle(comments[c],'display',show);

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

			




	
	
	
		
 
              for(c in btns){

			




	
	
	
		
 
                  YUD.setStyle(btns[c],'display',show);

			




	
	
	
		
 
               }

			




	
	
	
		
 
          })

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.line'),'click',function(e){

			




	
	
	
		
 
              var tr = e.currentTarget;

			




	
	
	
		
 
              if(tr == null){

			




	
	
	
		
 
                  tr = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              injectInlineForm(tr);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = YUQ('.inline-comment-placeholder');

			




	
	
	
		
 
          renderInlineComments(file_comments);

			




	
	
	
		
 
      })

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.