Merge branch 'next-minor' into develop

Changelog.md

@@ -36,6 +36,7 @@ Although the chat was never enabled per default and was marked as experimental,
 ## Refactor
 
 ## Bug fixes
+* Update comment counter when weleting a comment in the Single Post View [#7938](https://github.com/diaspora/diaspora/pull/7938)
 
 ## Features
 * Support and recommend TOML as configuration format [#8132](https://github.com/diaspora/diaspora/pull/8132)

app/assets/javascripts/app/models/post/interactions.js

@@ -85,6 +85,10 @@ app.models.Post.Interactions = Backbone.Model.extend({
     });
   },
 
+  removedComment: function() {
+    this.set({"comments_count": this.get("comments_count") - 1});
+  },
+
   reshare : function(){
     var interactions = this;
 

app/assets/javascripts/app/views/comment_stream_view.js

@@ -135,7 +135,10 @@ app.views.CommentStream = app.views.Base.extend({
   },
 
   removeComment: function(comment) {
-    this.$("#" + comment.get("guid")).closest(".comment.media").remove();
+    var result = this.$("#" + comment.get("guid")).closest(".comment.media").remove();
+    if (result.hasClass("deleting")) {
+      this.model.interactions.removedComment();
+    }
   },
 
   expandComments: function(evt){