merge fix from master (Don't execute createReplyForm js if there is no in_reply_to button)

This commit is contained in:
Vincent Fretin 2014-10-09 11:41:00 +02:00
parent acacc8281a
commit 06b20b8f81
2 changed files with 4 additions and 1 deletions

View File

@ -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]

View File

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