From 22e4189c37bb1b399451732201d7767b76d988dd Mon Sep 17 00:00:00 2001
From: Timo Stollenwerk <timo@zmag.de>
Date: Thu, 28 Oct 2010 09:39:00 +0000
Subject: [PATCH] Revert revisions r40851 to r40853, they should have gone into
 the ajax-ui branch.

svn path=/plone.app.discussion/trunk/; revision=40856
---
 plone/app/discussion/browser/comments.py      |  1 -
 .../browser/javascripts/comments.js           | 96 +------------------
 2 files changed, 2 insertions(+), 95 deletions(-)

diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index fd01790..8a85457 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -47,7 +47,6 @@ except ImportError: # pragma: no cover
 class CommentForm(extensible.ExtensibleForm, form.Form):
 
     ignoreContext = True # don't use context to get widget data
-    id = "comment-form"
     label = _(u"Add a comment")
     fields = field.Fields(IComment).omit('portal_type',
                                          '__parent__',
diff --git a/plone/app/discussion/browser/javascripts/comments.js b/plone/app/discussion/browser/javascripts/comments.js
index dfce697..e3dd95b 100644
--- a/plone/app/discussion/browser/javascripts/comments.js
+++ b/plone/app/discussion/browser/javascripts/comments.js
@@ -141,6 +141,8 @@
 	
 	    });
 	
+
+
 	    /**********************************************************************
 	     * By default, hide the reply and the cancel button for the regular add
 	     * comment form.
@@ -157,100 +159,6 @@
 	     * enabled.
 	     **********************************************************************/
 	    $(".reply-to-comment-button").css("display" , "inline");
-
-        $("#form-buttons-comment").addClass("allowMultiSubmit");
-
-
-        /**********************************************************************
-         * 
-         **********************************************************************/
-        $("[name='form.button.DeleteComment']").live('click', function() {
-            var trigger = this;
-            var form = $(this).parents("form");
-            var data = $(form).serialize();
-            var form_url = $(form).attr("action");
-            var comment_div = form.parent().parent();
-            $.ajax({
-                type:'POST',
-                url:form_url,
-                context: $(trigger).parents(".comment"),
-                success: function(data) { 
-                    if($(".discussion .comment").length == 1) {
-                        comment_div.fadeOut('fast', function() {
-                            comment_div.remove();
-                        });
-                    } 
-                    else {
-                        $(this).fadeOut('fast', function() {
-                            $(this).remove();
-                        });
-                    }
-                },
-                error: function(req, error) {
-                    return true;
-                }
-            });
-            return false;
-        })
-        
-        $("[name='form.button.PublishComment']").live('click', function() {
-            alert("publish");
-            var trigger = this;
-            var form = $(this).parents("form");
-            var data = $(form).serialize();
-            var form_url = $(form).attr("action");
-            $.ajax({
-                type: "GET",
-                url: form_url,
-                data: "workflow_action=publish",
-                context: trigger,
-                success: function (msg) {
-                    // fade out row
-                    $(this).parents("li").fadeOut("normal", function () {
-                        $(this).parents("li").remove();
-                    });
-                },
-                error: function (msg) {
-                    return true;
-                }
-            });
-            return false;
-        });
-        
-        $("#comment-form").submit(function(){
-            var button = $("#comment-form .formControls input.submitting");
-            // disable the submit button
-            $(button).attr('disabled', 'disabled');
-            // we have to serialize the form data and append the name and value
-            // of the submit button, otherwise the form will not work.            
-            var data = $("#comment-form").serialize() + '&' + $(button).attr("name") + '=' + $(button).attr("value");
-            var form_url = $(this).attr("action");
-            $(this).get(0).reset();
-            $.ajax({
-                type: 'POST',
-                url: form_url,
-                data: data,
-                success: function(data) {
-                    var jqobj = $(data);
-                    var new_comment;
-                    if($(".discussion").length > 0) {
-                        new_comment = $(jqobj).find(".discussion .comment:last-child");
-                        $(new_comment).hide();
-                        $(".discussion").append(new_comment);                        
-                    } else {
-                        new_comment = $(jqobj).find(".discussion");
-                        $(new_comment).hide();                        
-                        $(new_comment).insertBefore("#commenting");
-                    }
-                    $(new_comment).fadeIn('slow');
-                    $(button).removeAttr('disabled');
-                },
-                error: function(req,error){
-                    return true
-                }
-            });
-            return false;
-        })
 	
 	});