From 3521d42175d8117faf0451abfe4fef600bfba088 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Thu, 30 Aug 2012 17:46:23 -0400 Subject: [PATCH] Add highlighting back in --- lms/static/coffee/src/discussion/content.coffee | 4 ++-- .../src/discussion/views/discussion_thread_list_view.coffee | 2 -- .../coffee/src/discussion/views/discussion_thread_view.coffee | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lms/static/coffee/src/discussion/content.coffee b/lms/static/coffee/src/discussion/content.coffee index 77d57a9e9b..29fe2d0b4a 100644 --- a/lms/static/coffee/src/discussion/content.coffee +++ b/lms/static/coffee/src/discussion/content.coffee @@ -429,13 +429,13 @@ if Backbone? display_body: -> if @has("highlighted_body") - @get("highlighted_body") + String(@get("highlighted_body")).replace(//g, '').replace(/<\/highlight>/g, '') else @get("body") display_title: -> if @has("highlighted_title") - @get("highlighted_title") + String(@get("highlighted_title")).replace(//g, '').replace(/<\/highlight>/g, '') else @get("title") diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index c263770a3f..79af07a0ef 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -64,9 +64,7 @@ class @DiscussionThreadListView extends Backbone.View url: url type: "GET" success: (response, textStatus) => - console.log textStatus if textStatus == 'success' @collection.reset(response.discussion_data) - console.log(@collection) @delay(callback, 300) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee index 8734272e74..f8d1ae7282 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -6,6 +6,7 @@ class @DiscussionThreadView extends Backbone.View template: _.template($("#thread-template").html()) render: -> + console.log(@model) @$el.html(@template(@model.toJSON())) @model.bind "change", @updateModelDetails if window.user.following(@model) @@ -24,7 +25,7 @@ class @DiscussionThreadView extends Backbone.View convertMath: -> element = @$(".post-body") - element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html() + element.html DiscussionUtil.postMathJaxProcessor(element.html()) MathJax.Hub.Queue ["Typeset", MathJax.Hub, element.attr("id")] renderResponses: ->