Merge branch 'release'

common/static/coffee/spec/discussion/view/discussion_thread_view_inline_spec.coffee

@@ -5,6 +5,7 @@ describe "DiscussionThreadInlineView", ->
             <script type="text/template" id="_inline_thread">
                 <article class="discussion-article">
                     <div class="non-cohorted-indicator"/>
+                    <div class="post-body"/>
                     <div class="post-extended-content">
                         <div class="response-count"/> 
                         <ol class="responses"/>
@@ -19,6 +20,7 @@ describe "DiscussionThreadInlineView", ->
             <script type="text/template" id="_inline_thread_cohorted">
                 <article class="discussion-article">
                     <div class="cohorted-indicator"/>
+                    <div class="post-body"/>
                     <div class="post-extended-content">
                         <div class="response-count"/> 
                         <ol class="responses"/>
@@ -87,3 +89,14 @@ describe "DiscussionThreadInlineView", ->
             assertExpandedContentVisible(@view, true)
             @view.collapsePost()
             assertExpandedContentVisible(@view, false)
+
+        it "switches between the abbreviated and full body", ->
+            DiscussionViewSpecHelper.setNextResponseContent({resp_total: 0, children: []})
+            @thread.set("body", new Array(100).join("test "))
+            @view.abbreviateBody()
+            expect(@thread.get("body")).not.toEqual(@thread.get("abbreviatedBody"))
+            @view.render()
+            @view.expandPost()
+            expect(@view.$el.find(".post-body").text()).toEqual(@thread.get("body"))
+            @view.collapsePost()
+            expect(@view.$el.find(".post-body").text()).toEqual(@thread.get("abbreviatedBody"))

common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee

@@ -45,6 +45,7 @@ if Backbone?
 
     expandPost: (event) =>
       @$el.addClass('expanded')
+      @$el.find('.post-body').html(@model.get('body'))
       @$el.find('.expand-post').css('display', 'none')
       @$el.find('.collapse-post').css('display', 'block')
       @$el.find('.post-extended-content').show()
@@ -58,6 +59,7 @@ if Backbone?
       if postTop < curScroll
         $('html, body').animate({scrollTop: postTop})
       @$el.removeClass('expanded')
+      @$el.find('.post-body').html(@model.get('abbreviatedBody'))
       @$el.find('.expand-post').css('display', 'block')
       @$el.find('.collapse-post').css('display', 'none')
       @$el.find('.post-extended-content').hide()