From 6ae2df2f9e8ee80f5a8d17c5808696880e8b82c0 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 17 Aug 2017 04:08:33 +0200
Subject: [PATCH] Fix missing timeagos for comments in the single post view
---
app/assets/javascripts/app/views/comment_stream_view.js | 4 +++-
spec/javascripts/app/views/comment_stream_view_spec.js | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/app/views/comment_stream_view.js b/app/assets/javascripts/app/views/comment_stream_view.js
index d632727170..2a1b816129 100644
--- a/app/assets/javascripts/app/views/comment_stream_view.js
+++ b/app/assets/javascripts/app/views/comment_stream_view.js
@@ -118,7 +118,8 @@ app.views.CommentStream = app.views.Base.extend({
// on post ownership in the Comment view.
comment.set({parent : this.model.toJSON()});
- var commentHtml = new this.CommentView({model: comment}).render().el;
+ var commentView = new this.CommentView({model: comment});
+ var commentHtml = commentView.render().el;
var commentBlocks = this.$(".comments div.comment.media");
this._moveInsertPoint(comment.get("created_at"), commentBlocks);
if (this._insertPoint >= commentBlocks.length) {
@@ -128,6 +129,7 @@ app.views.CommentStream = app.views.Base.extend({
} else {
commentBlocks.eq(this._insertPoint).before(commentHtml);
}
+ commentView.renderPluginWidgets();
},
removeComment: function(comment) {
diff --git a/spec/javascripts/app/views/comment_stream_view_spec.js b/spec/javascripts/app/views/comment_stream_view_spec.js
index c003bb0bd5..284b16c7ab 100644
--- a/spec/javascripts/app/views/comment_stream_view_spec.js
+++ b/spec/javascripts/app/views/comment_stream_view_spec.js
@@ -267,6 +267,14 @@ describe("app.views.CommentStream", function(){
expect(this.view.$(".comments div.comment.media").length).toEqual(6);
expect(this.view.$(".comments div.comment.media div.comment-content p").text()).toEqual("123456");
});
+
+ it("calls renderPluginWidgets", function() {
+ var comment = factory.comment();
+ this.view.CommentView = app.views.Comment;
+ spyOn(app.views.Comment.prototype, "renderPluginWidgets");
+ this.view.appendComment(comment);
+ expect(app.views.Comment.prototype.renderPluginWidgets).toHaveBeenCalled();
+ });
});
describe("removeComment", function() {
--
GitLab