duplicated comment markup in post.js to reflect template changes, fixed bug in writers.py (comment score not being returned in json after comment edit)

4 files changed, 30 insertions, 14 deletions

diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js
index ec70824e..49eadf06 100644
--- a/askbot/skins/default/media/js/post.js
+++ b/askbot/skins/default/media/js/post.js
@@ -1072,6 +1072,7 @@ EditCommentForm.prototype.getSaveHandler = function(){
     return function(){
         var text = me._textarea.val();
         if (text.length <= 10){
+            alert(text.length);
             me.focus();
             return false;
         }
@@ -1217,35 +1218,46 @@ Comment.prototype.setContent = function(data){
 
     this._element.append(votes);
 
-    this._element.append(this._data['html']);
-    this._element.append(' - ');
+    this._comment_delete = $('<div class="comment-delete"></div>');
+    if (this._deletable){
+        this._delete_icon = new DeleteIcon(this._delete_prompt);
+        this._delete_icon.setHandler(this.getDeleteHandler());
+        this._comment_delete.append(this._delete_icon.getElement());
+    }
+    this._element.append(this._comment_delete);
+    
+    this._comment_body = $('<div class="comment-body"></div>');
+    this._comment_body.html(this._data['html']);
+    this._comment_body.append(' &ndash; ');
 
     this._user_link = $('<a></a>').attr('class', 'author');
     this._user_link.attr('href', this._data['user_url']);
     this._user_link.html(this._data['user_display_name']);
-    this._element.append(this._user_link);
+    this._comment_body.append(this._user_link);
 
-    this._element.append(' (');
+    this._comment_body.append(' (');
     this._comment_age = $('<span class="age"></span>');
     this._comment_age.html(this._data['comment_age']);
-    this._element.append(this._comment_age);
-    this._element.append(')');
+    this._comment_body.append(this._comment_age);
+    this._comment_body.append(')');
 
     if (this._editable){
         this._edit_link = new EditLink();
         this._edit_link.setHandler(this.getEditHandler())
-        this._element.append(this._edit_link.getElement());
-    }
-
-    if (this._deletable){
-        this._delete_icon = new DeleteIcon(this._delete_prompt);
-        this._delete_icon.setHandler(this.getDeleteHandler());
-        this._element.append(this._delete_icon.getElement());
+        this._comment_body.append(this._edit_link.getElement());
     }
+    this._element.append(this._comment_body);
+    
     this._blank = false;
 };
 
 Comment.prototype.dispose = function(){
+    if (this._comment_body){
+        this._comment_body.remove();
+    }
+    if (this._comment_delete){
+        this._comment_delete.remove();
+    }    
     if (this._user_link){
         this._user_link.remove();
     }
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index dbf8f29e..6231e2f1 100755
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -1037,7 +1037,7 @@ div.comment .upvote:hover {
     margin: 3px 0 4px 0;
     font-family: sans-serif;
     font-size: 12px;
-    line-height: 15px;
+    line-height: 130%;
     padding: 2px 0 0 2px;
 }
 
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 0af8d5b2..3e0971a2 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -460,6 +460,9 @@ poor design of the data or methods on data objects #}
     </div>
 {%- endmacro -%}
 
+{# Warning! Any changes to the comment markup here must be duplicated in post.js
+for the purposes of the AJAX comment editor #}
+
 {%- macro comment_list(comments = None, user = None) -%}
     {% for comment in comments %}
     <div class="comment" id="comment-{{comment.id}}">
diff --git a/askbot/views/writers.py b/askbot/views/writers.py
index c5a69c1d..0bd1bb6f 100644
--- a/askbot/views/writers.py
+++ b/askbot/views/writers.py
@@ -607,6 +607,7 @@ def edit_comment(request):
             'user_id': comment.user.id,
             'is_deletable': is_deletable,
             'is_editable': is_editable,
+            'score': comment.score,            
             'voted': comment.is_upvoted_by(request.user),
         }
     else: