Commit 00328189 by Tom Giannattasio

Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into…

Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions
parents 80c6366d dcf1b1db
...@@ -16,8 +16,6 @@ class @DiscussionRouter extends Backbone.Router ...@@ -16,8 +16,6 @@ class @DiscussionRouter extends Backbone.Router
allThreads: -> allThreads: ->
@nav.updateSidebar() @nav.updateSidebar()
# TODO: Do something reasonable here
# $(".discussion-column").html($('#blank-slate-template').html())
setActiveThread: => setActiveThread: =>
if @thread if @thread
......
...@@ -10,7 +10,7 @@ class @ResponseCommentView extends DiscussionContentView ...@@ -10,7 +10,7 @@ class @ResponseCommentView extends DiscussionContentView
@initLocal() @initLocal()
@delegateEvents() @delegateEvents()
@renderAttrs() @renderAttrs()
@$(".timeago").timeago() @$el.find(".timeago").timeago()
@convertMath() @convertMath()
@ @
convertMath: -> convertMath: ->
......
...@@ -15,7 +15,7 @@ class @ThreadResponseView extends DiscussionContentView ...@@ -15,7 +15,7 @@ class @ThreadResponseView extends DiscussionContentView
if window.user.voted(@model) if window.user.voted(@model)
@$(".vote-btn").addClass("is-cast") @$(".vote-btn").addClass("is-cast")
@renderAttrs() @renderAttrs()
@$(".posted-details").timeago() @$el.find(".posted-details").timeago()
@convertMath() @convertMath()
@renderComments() @renderComments()
@ @
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment