From 08857df7a9586878cd7b0aa1ab9bdbbb35bdae6b Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Sat, 11 Dec 2010 21:33:43 +0000
Subject: [PATCH] Fix cancel button on edit view when using Dexterity types.
 This fixes  http://dev.plone.org/plone/ticket/11338. Refs #11338

svn path=/plone.app.discussion/trunk/; revision=46254
---
 CHANGES.txt                                          | 4 ++++
 plone/app/discussion/browser/javascripts/comments.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f4e9a8b..a19a3e0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0RC1 (unreleased)
 -------------------
 
+- Fix cancel button on edit view when using Dexterity types. This fixes 
+  http://dev.plone.org/plone/ticket/11338.
+  [EpeliJYU]
+  
 - Assigning the 'Reply to item' permission to the 'Authenticated' role. The old
   commenting system allowed 'Authenticated' users to post comments. Also, OpenID
   users do not possess the 'Authenticated' role.
diff --git a/plone/app/discussion/browser/javascripts/comments.js b/plone/app/discussion/browser/javascripts/comments.js
index 7a0dd6e..5a0cff8 100644
--- a/plone/app/discussion/browser/javascripts/comments.js
+++ b/plone/app/discussion/browser/javascripts/comments.js
@@ -120,7 +120,7 @@
 	     * If the user hits the "clear" button of an open reply-to-comment form,
 	     * remove the form and show the "reply" button again.
 	     **********************************************************************/
-	    $("#form-buttons-cancel").bind("click", function (e) {
+        $("#commenting #form-buttons-cancel").bind("click", function (e) {
 	        e.preventDefault();
 	        var reply_to_comment_button = $(this).
 			                                  parents().