Merge branch 'master' into talmdal_dev

1 files changed, 5 insertions, 4 deletions

diff --git a/modules/comment/js/comment.js b/modules/comment/js/comment.js
index 3c8097c6..2487c5fc 100644
--- a/modules/comment/js/comment.js
+++ b/modules/comment/js/comment.js
@@ -1,5 +1,5 @@
 $("document").ready(function() {
-  $("#g-admin-comment-button").click(function(event) {
+  $("#g-add-comment").click(function(event) {
     event.preventDefault();
     if (!$("#g-comment-form").length) {
       $.get($(this).attr("href"),
@@ -7,10 +7,11 @@ $("document").ready(function() {
 	    function(data) {
 	      $("#g-comment-detail").append(data);
 	      ajaxify_comment_form();
+        $.scrollTo("#g-comment-form-anchor", 800);
 	    });
     }
   });
-  $("#g-no-comments").click(function(event) {
+  $(".g-no-comments a").click(function(event) {
     event.preventDefault();
     if (!$("#g-comment-form").length) {
       $.get($(this).attr("href"),
@@ -19,7 +20,7 @@ $("document").ready(function() {
 	      $("#g-comment-detail").append(data);
 	      ajaxify_comment_form();
 	    });
-      $("#g-no-comments-yet").remove();
+      $(".g-no-comments").remove();
     }
   });
 });
@@ -32,7 +33,7 @@ function ajaxify_comment_form() {
         $("#g-comments #g-comment-detail ul").append(data.view);
         $("#g-comments #g-comment-detail ul li:last").effect("highlight", {color: "#cfc"}, 8000);
         $("#g-comment-form").hide(2000).remove();
-        $("#g-no-comments-yet").hide(2000);
+        $("#g-no-comments").hide(2000);
       } else {
         if (data.form) {
           $("#g-comments form").replaceWith(data.form);