From a152041ef80de936541be7947f70d97ffc256fdd Mon Sep 17 00:00:00 2001 From: Tom Giannattasio Date: Thu, 13 Sep 2012 10:25:10 -0400 Subject: [PATCH] fixed inline thread replace error --- .../src/discussion/views/discussion_thread_show_view.coffee | 3 ++- lms/templates/discussion/mustache/_inline_thread.mustache | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee index 17a852e8a5..8bb01196d0 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_show_view.coffee @@ -125,7 +125,8 @@ class @DiscussionThreadShowView extends DiscussionContentView @model.set('endorsed', not endorsed) highlight: (el) -> - el.html(el.html().replace(/<mark>/g, "").replace(/<\/mark>/g, "")) + if el.html() + el.html(el.html().replace(/<mark>/g, "").replace(/<\/mark>/g, "")) class @DiscussionThreadInlineShowView extends DiscussionThreadShowView renderTemplate: -> diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache index a874b728ce..743e06ba9d 100644 --- a/lms/templates/discussion/mustache/_inline_thread.mustache +++ b/lms/templates/discussion/mustache/_inline_thread.mustache @@ -6,10 +6,10 @@

{{title}}

{{#user}} - {{username}} + {{username}} {{/user}} {{^user}} - anonymous + anonymous {{/user}} {{created_at}}