merge fix from master (Don't execute createReplyForm js if there is no in_reply_to button)
This commit is contained in:
		
							parent
							
								
									acacc8281a
								
							
						
					
					
						commit
						06b20b8f81
					
				@ -8,6 +8,9 @@ Changelog
 | 
				
			|||||||
  there are no replies yet.
 | 
					  there are no replies yet.
 | 
				
			||||||
  [gaudenz]
 | 
					  [gaudenz]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Don't execute createReplyForm js if there is no in_reply_to button.
 | 
				
			||||||
 | 
					  [vincentfretin]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Register events as Content Rules Event Types if plone.contentrules is present
 | 
					- Register events as Content Rules Event Types if plone.contentrules is present
 | 
				
			||||||
  [avoinea]
 | 
					  [avoinea]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -106,7 +106,7 @@
 | 
				
			|||||||
        var post_comment_div = $("#commenting");
 | 
					        var post_comment_div = $("#commenting");
 | 
				
			||||||
        var in_reply_to_field =
 | 
					        var in_reply_to_field =
 | 
				
			||||||
            post_comment_div.find("input[name='form.widgets.in_reply_to']");
 | 
					            post_comment_div.find("input[name='form.widgets.in_reply_to']");
 | 
				
			||||||
        if (in_reply_to_field.val() !== "") {
 | 
					        if (in_reply_to_field.length !== 0 && in_reply_to_field.val() !== "") {
 | 
				
			||||||
            var current_reply_id = "#" + in_reply_to_field.val();
 | 
					            var current_reply_id = "#" + in_reply_to_field.val();
 | 
				
			||||||
            var current_reply_to_div = $(".discussion").find(current_reply_id);
 | 
					            var current_reply_to_div = $(".discussion").find(current_reply_id);
 | 
				
			||||||
            $.createReplyForm(current_reply_to_div);
 | 
					            $.createReplyForm(current_reply_to_div);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user