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

make retrieved single thread/comment after update integrated with permissions

Browse Source
This commit is contained in:
Rocky Duan
2012-08-13 21:42:28 -07:00
parent 0fa0f2c8ae
commit 6fa0298546
6 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/static/coffee/src/discussion/content.coffee
View File

@@ -81,6 +81,7 @@ initializeFollowThread = (thread) ->
Discussion.setWmdContent $content, $local, "reply-body", ""
Discussion.setContentInfo response.content['id'], 'can_reply', true
Discussion.setContentInfo response.content['id'], 'editable', true
Discussion.extendContentInfo response.content['id'], response['annotated_content_info']
Discussion.initializeContent($comment)
Discussion.bindContentEvents($comment)
$local(".discussion-reply-new").hide()
@@ -151,6 +152,7 @@ initializeFollowThread = (thread) ->
error: Discussion.formErrorHandler($local(".discussion-update-errors"))
success: (response, textStatus) ->
$discussionContent.replaceWith(response.html)
Discussion.extendContentInfo response.content['id'], response['annotated_content_info']
Discussion.initializeContent($content)
Discussion.bindContentEvents($content)
@@ -178,6 +180,7 @@ initializeFollowThread = (thread) ->
error: Discussion.formErrorHandler($local(".discussion-update-errors"))
success: (response, textStatus) ->
$discussionContent.replaceWith(response.html)
Discussion.extendContentInfo response.content['id'], response['annotated_content_info']
Discussion.initializeContent($content)
Discussion.bindContentEvents($content)
@@ -207,7 +210,7 @@ initializeFollowThread = (thread) ->
else if text.match(/[Oo]pen/)
closed = false
else
return console.log "Unexpected text " + text + "for open/close thread."
console.log "Unexpected text " + text + "for open/close thread."
Discussion.safeAjax
$elem: $(elem)
@@ -278,7 +281,7 @@ initializeFollowThread = (thread) ->
type: "GET"
dataType: 'json'
success: (response, textStatus) ->
Discussion.bulkExtendContentInfo response['annotated_content_info']
Discussion.extendContentInfo response.content['id'], response['annotated_content_info']
$content.append(response['html'])
$content.find(".comment").each (index, comment) ->
Discussion.initializeContent(comment)
@@ -368,10 +371,10 @@ initializeFollowThread = (thread) ->
MathJax.Hub.Queue ["Typeset", MathJax.Hub, $contentBody.attr("id")]
id = $content.attr("_id")
if not Discussion.getContentInfo id, 'editable'
$local(".discussion-edit").remove()
$local(".admin-edit").remove()
if not Discussion.getContentInfo id, 'can_reply'
$local(".discussion-reply").remove()
if not Discussion.getContentInfo id, 'can_endorse'
$local(".discussion-endorse-control").remove()
$local(".admin-endorse").remove()
if not Discussion.getContentInfo id, 'can_delete'
$local(".discussion-delete").remove()
$local(".admin-delete").remove()

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

@@ -51,7 +51,8 @@ initializeFollowDiscussion = (discussion) ->
$thread = $(response.html)
$discussion.children(".threads").prepend($thread)
Discussion.setWmdContent $discussion, $local, "new-post-body", ""
Discussion.setContentInfo response.content['id'], 'editable', true
#Discussion.setContentInfo response.content['id'], 'editable', true
Discussion.extendContentInfo response.content['id'], response['annotated_content_info']
Discussion.initializeContent($thread)
Discussion.bindContentEvents($thread)
$(".new-post-form").addClass("collapsed")

4
lms/static/coffee/src/discussion/utils.coffee
View File

@@ -147,6 +147,10 @@ wmdEditors = {}
window.$$annotated_content_info[id] ||= {}
window.$$annotated_content_info[id][attr] = value
extendContentInfo: (id, newInfo) ->
if not window.$$annotated_content_info?
window.$$annotated_content_info = {}
window.$$annotated_content_info[id] = newInfo
bulkExtendContentInfo: (newInfos) ->
if not window.$$annotated_content_info?
window.$$annotated_content_info = {}