Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev

Conflicts:
	modules/gallery/controllers/albums.php

1 files changed, 10 insertions, 8 deletions

diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
index 9fd63c1a..bff83770 100644
--- a/modules/comment/js/comment.js
+++ b/modules/comment/js/comment.js
@@ -1,13 +1,15 @@
 $("document").ready(function() {
   $("#gAddCommentButton").click(function(event) {
     event.preventDefault();
-    $.get($(this).attr("href"),
-          {},
-          function(data) {
-            $("#gCommentDetail").append(data);
-            ajaxify_comment_form();
-          });
-    });
+    if (!$("#gAddCommentForm").length) {
+      $.get($(this).attr("href"),
+	    {},
+	    function(data) {
+	      $("#gCommentDetail").append(data);
+	      ajaxify_comment_form();
+	    });
+    }
+  });
 });
 
 function ajaxify_comment_form() {
@@ -22,7 +24,7 @@ function ajaxify_comment_form() {
         $.get(data.resource, function(data, textStatus) {
           $("#gComments .gBlockContent ul:first").append("<li>"+data+"</li>");
           $("#gComments .gBlockContent ul:first li:last").effect("highlight", {color: "#cfc"}, 8000);
-          $("#gAddCommentForm").hide(2000);
+          $("#gAddCommentForm").hide(2000).remove();
 	  $("#gNoCommentsYet").hide(2000);
         });
       }