Commit 22444e3f by Rocky Duan

make cancel/submit work and hide watch discussion

parent ed346443
...@@ -221,7 +221,7 @@ Discussion = ...@@ -221,7 +221,7 @@ Discussion =
if $$user_info? if $$user_info?
$local(".comment").each(initializeVote) $local(".comment").each(initializeVote)
$local(".thread").each(initializeVote).each(initializeWatchThreads) $local(".thread").each(initializeVote).each(initializeWatchThreads)
initializeWatchDiscussion(discussion) #initializeWatchDiscussion(discussion) TODO move this somewhere else
$local(".new-post-tags").tagsInput $local(".new-post-tags").tagsInput
autocomplete_url: Discussion.urlFor('tags_autocomplete') autocomplete_url: Discussion.urlFor('tags_autocomplete')
...@@ -262,8 +262,8 @@ Discussion = ...@@ -262,8 +262,8 @@ Discussion =
} }
$discussionContent.append Mustache.render Discussion.replyTemplate, view $discussionContent.append Mustache.render Discussion.replyTemplate, view
Markdown.makeWmdEditor $local(".reply-body"), "-reply-body-#{id}", Discussion.urlFor('upload') Markdown.makeWmdEditor $local(".reply-body"), "-reply-body-#{id}", Discussion.urlFor('upload')
$local(".discussion-submit-reply").click handleSubmitReply $local(".discussion-submit-post").click handleSubmitReply
$local(".discussion-cancel-reply").click handleCancelReply $local(".discussion-cancel-post").click handleCancelReply
$local(".discussion-link").hide() $local(".discussion-link").hide()
$discussionContent.attr("status", "reply") $discussionContent.attr("status", "reply")
...@@ -430,10 +430,13 @@ Discussion = ...@@ -430,10 +430,13 @@ Discussion =
$local(".thread-title").click handleShowSingleThread $local(".thread-title").click handleShowSingleThread
$local(".discussion-show-comments").click handleShowSingleThread $local(".discussion-show-comments").click handleShowSingleThread
$local(".discussion-reply").click -> $local(".discussion-reply-thread").click ->
handleShowSingleThread($local(".thread-title")) handleShowSingleThread($local(".thread-title"))
handleReply(this) handleReply(this)
$local(".discussion-reply-comment").click ->
handleReply(this)
$local(".discussion-cancel-reply").click -> $local(".discussion-cancel-reply").click ->
handleCancelReply(this) handleCancelReply(this)
...@@ -494,6 +497,7 @@ Discussion = ...@@ -494,6 +497,7 @@ Discussion =
, 'json' , 'json'
handleCancelNewPost = (elem) -> handleCancelNewPost = (elem) ->
console.log "canceling"
$local(".new-post-form").hide() $local(".new-post-form").hide()
$local(".discussion-new-post").show() $local(".discussion-new-post").show()
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<%def name="render_bottom_bar(content, type, **kwargs)"> <%def name="render_bottom_bar(content, type, **kwargs)">
<div class="info"> <div class="info">
${render_info(content)} ${render_info(content)}
${render_link("discussion-link discussion-reply", "Reply")} ${render_link("discussion-link discussion-reply discussion-reply-" + type, "Reply")}
% if type == "thread" and kwargs['edit_thread'] or type == "comment": % if type == "thread" and kwargs['edit_thread'] or type == "comment":
${render_link("discussion-link discussion-edit", "Edit")} ${render_link("discussion-link discussion-edit", "Edit")}
% endif % endif
......
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