diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_profile_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_profile_view_spec.coffee deleted file mode 100644 index f10d30d0af..0000000000 --- a/common/static/coffee/spec/discussion/view/discussion_thread_profile_view_spec.coffee +++ /dev/null @@ -1,40 +0,0 @@ -describe "DiscussionThreadProfileView", -> - beforeEach -> - setFixtures( - """ -
- - 0 votes (click to vote) - -
- """ - ) - - @threadData = { - id: "dummy", - user_id: "567", - course_id: "TestOrg/TestCourse/TestRun", - body: "this is a thread", - created_at: "2013-04-03T20:08:39Z", - abuse_flaggers: [], - votes: {up_count: "42"} - } - @thread = new Thread(@threadData) - @view = new DiscussionThreadProfileView({ model: @thread }) - @view.setElement($(".discussion-post")) - window.user = new DiscussionUser({id: "567", upvoted_ids: []}) - - it "renders the vote correctly", -> - DiscussionViewSpecHelper.checkRenderVote(@view, @thread) - - it "votes correctly", -> - DiscussionViewSpecHelper.checkVote(@view, @thread, @threadData, true) - - it "unvotes correctly", -> - DiscussionViewSpecHelper.checkUnvote(@view, @thread, @threadData, true) - - it "toggles the vote correctly", -> - DiscussionViewSpecHelper.checkToggleVote(@view, @thread) - - it "vote button activates on appropriate events", -> - DiscussionViewSpecHelper.checkVoteButtonEvents(@view) diff --git a/common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee index 2564015b1b..8fa3330076 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee @@ -1,94 +1,22 @@ if Backbone? - class @DiscussionThreadProfileView extends DiscussionContentView - expanded = false - events: - "click .vote-btn": - (event) -> @toggleVote(event) - "keydown .vote-btn": - (event) -> DiscussionUtil.activateOnSpace(event, @toggleVote) - "click .action-follow": "toggleFollowing" - "keydown .action-follow": - (event) -> DiscussionUtil.activateOnSpace(event, @toggleFollowing) - "click .expand-post": "expandPost" - "click .collapse-post": "collapsePost" - - initLocal: -> - @$local = @$el.children(".discussion-article").children(".local") - @$delegateElement = @$local - - initialize: -> - super() - @model.on "change", @updateModelDetails - + class @DiscussionThreadProfileView extends Backbone.View render: -> @template = DiscussionUtil.getTemplate("_profile_thread") if not @model.has('abbreviatedBody') @abbreviateBody() - params = $.extend(@model.toJSON(),{expanded: @expanded, permalink: @model.urlFor('retrieve')}) + params = $.extend(@model.toJSON(),{permalink: @model.urlFor('retrieve')}) if not @model.get('anonymous') params = $.extend(params, user:{username: @model.username, user_url: @model.user_url}) @$el.html(Mustache.render(@template, params)) - @initLocal() - @delegateEvents() - @renderVote() - @renderAttrs() @$("span.timeago").timeago() @convertMath() - if @expanded - @renderResponses() @ - updateModelDetails: => - @renderVote() - convertMath: -> element = @$(".post-body") element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.text() MathJax.Hub.Queue ["Typeset", MathJax.Hub, element[0]] - renderResponses: -> - DiscussionUtil.safeAjax - url: "/courses/#{$$course_id}/discussion/forum/#{@model.get('commentable_id')}/threads/#{@model.id}" - $loading: @$el - success: (data, textStatus, xhr) => - @$el.find(".loading").remove() - Content.loadContentInfos(data['annotated_content_info']) - comments = new Comments(data['content']['children']) - comments.each @renderResponse - @trigger "thread:responses:rendered" - - renderResponse: (response) => - response.set('thread', @model) - view = new ThreadResponseView(model: response) - view.on "comment:add", @addComment - view.render() - @$el.find(".responses").append(view.el) - - addComment: => - @model.comment() - - edit: -> - abbreviateBody: -> abbreviated = DiscussionUtil.abbreviateString @model.get('body'), 140 @model.set('abbreviatedBody', abbreviated) - - expandPost: (event) -> - @expanded = true - @$el.addClass('expanded') - @$el.find('.post-body').html(@model.get('body')) - @convertMath() - @$el.find('.expand-post').css('display', 'none') - @$el.find('.collapse-post').css('display', 'block') - @$el.find('.post-extended-content').show() - if @$el.find('.loading').length - @renderResponses() - - collapsePost: (event) -> - @expanded = false - @$el.removeClass('expanded') - @$el.find('.post-body').html(@model.get('abbreviatedBody')) - @convertMath() - @$el.find('.collapse-post').css('display', 'none') - @$el.find('.post-extended-content').hide() - @$el.find('.expand-post').css('display', 'block') diff --git a/lms/templates/discussion/mustache/_profile_thread.mustache b/lms/templates/discussion/mustache/_profile_thread.mustache index 114c883444..877251a90b 100644 --- a/lms/templates/discussion/mustache/_profile_thread.mustache +++ b/lms/templates/discussion/mustache/_profile_thread.mustache @@ -1,10 +1,8 @@ <%! from django.utils.translation import ugettext as _ %>
-
-

{{title}}

{{#user}} @@ -22,10 +20,6 @@

{{abbreviatedBody}}
-
    -
  1. -
-
${_("View discussion")}