From 92151e3bd63eeb37249eaa15e26f123de9ca7aae Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 17 Apr 2014 15:13:00 -0400 Subject: [PATCH] Render markup in inline threads on expand/collapse This was a bug in 3af90ef. --- .../discussion/view/discussion_thread_view_inline_spec.coffee | 4 ++++ .../src/discussion/views/discussion_thread_view_inline.coffee | 2 ++ 2 files changed, 6 insertions(+) diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_view_inline_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_view_inline_spec.coffee index 9e8582e504..5ec1c918e2 100644 --- a/common/static/coffee/spec/discussion/view/discussion_thread_view_inline_spec.coffee +++ b/common/static/coffee/spec/discussion/view/discussion_thread_view_inline_spec.coffee @@ -48,6 +48,7 @@ describe "DiscussionThreadInlineView", -> spyOn($, "ajax") # Avoid unnecessary boilerplate spyOn(@view.showView, "render") + spyOn(@view.showView, "convertMath") spyOn(@view, "makeWmdEditor") spyOn(DiscussionThreadView.prototype, "renderResponse") @@ -98,5 +99,8 @@ describe "DiscussionThreadInlineView", -> @view.render() @view.expandPost() expect(@view.$el.find(".post-body").text()).toEqual(@thread.get("body")) + expect(@view.showView.convertMath).toHaveBeenCalled() + @view.showView.convertMath.reset() @view.collapsePost() expect(@view.$el.find(".post-body").text()).toEqual(@thread.get("abbreviatedBody")) + expect(@view.showView.convertMath).toHaveBeenCalled() diff --git a/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee b/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee index bd4494f9a6..b28c4bba8d 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee @@ -46,6 +46,7 @@ if Backbone? expandPost: (event) => @$el.addClass('expanded') @$el.find('.post-body').html(@model.get('body')) + @showView.convertMath() @$el.find('.expand-post').css('display', 'none') @$el.find('.collapse-post').css('display', 'block') @$el.find('.post-extended-content').show() @@ -60,6 +61,7 @@ if Backbone? $('html, body').animate({scrollTop: postTop}) @$el.removeClass('expanded') @$el.find('.post-body').html(@model.get('abbreviatedBody')) + @showView.convertMath() @$el.find('.expand-post').css('display', 'block') @$el.find('.collapse-post').css('display', 'none') @$el.find('.post-extended-content').hide()