Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dementrock/mitx into discussion2

Browse Source
This commit is contained in:
Brittany Cheng
2012-07-31 12:51:17 -04:00
parent cf92f356c0 701f8716f7
commit 607bc6b50b
5 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/static/coffee/src/discussion.coffee
View File

@@ -199,7 +199,7 @@ Discussion =
else
view = {
id: id
showWatchCheckbox: $discussionContent.parent(".thread").attr("_id") not in $$user_info.subscribed_thread_ids
showWatchCheckbox: $discussionContent.parents(".thread").attr("_id") not in $$user_info.subscribed_thread_ids
}
$discussionContent.append Mustache.render Discussion.replyTemplate, view
Markdown.makeWmdEditor $local(".reply-body"), "-reply-body-#{id}", Discussion.urlFor('upload')
@@ -341,6 +341,11 @@ Discussion =
raw_text = $local(".content-body").html()
converter = Markdown.getMathCompatibleConverter()
$local(".content-body").html(converter.makeHtml(raw_text))
id = $content.attr("_id")
if not ($$annotated_content_info[id] || [])['editable']
$local(".discussion-edit").remove()
bindDiscussionEvents: (discussion) ->
$discussion = $(discussion)