From 6287e43f55f43903d837e2b40557e800e7375a6a Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Thu, 30 Aug 2012 11:50:38 -0400 Subject: [PATCH 1/5] Add ability to create replies. --- .../views/discussion_thread_view.coffee | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 10aae9ba2d..d880709d2d 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -2,6 +2,7 @@ class @DiscussionThreadView extends Backbone.View events: "click .discussion-vote-up": "toggleVote" "click .dogear": "toggleFollowing" + "click .discussion-submit-post": "submitComment" template: _.template($("#thread-template").html()) initialize: (options) -> @@ -80,3 +81,18 @@ class @DiscussionThreadView extends Backbone.View success: (response, textStatus) => if textStatus == 'success' @model.set(response) + + submitComment: -> + url = @model.urlFor('reply') + body = DiscussionUtil.getWmdContent @$el, $.proxy(@$, @), "reply-body" + response = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }) + @renderResponse(response) + + DiscussionUtil.safeAjax + $elem: $(event.target) + url: url + type: "POST" + dataType: 'json' + data: + body: body + false From afd6126e360c59e5730ab658096254e3b8009e7a Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Thu, 30 Aug 2012 12:43:02 -0400 Subject: [PATCH 2/5] Fix some styles. --- .../coffee/src/discussion/views/discussion_thread_view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d880709d2d..9301c3ecd4 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -19,7 +19,7 @@ class @DiscussionThreadView extends Backbone.View if window.user.voted(@model) @$(".vote-btn").addClass("is-cast") @$("span.timeago").timeago() - DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "reply-body" + Markdown.makeWmdEditor @$(".reply-body"), "", DiscussionUtil.urlFor("upload"), (text) -> DiscussionUtil.postMathJaxProcessor(text) @renderResponses() @ From 1acb6185dec1570673c43db33e82fb94360ef620 Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Thu, 30 Aug 2012 13:06:37 -0400 Subject: [PATCH 3/5] Get math working. --- .../views/discussion_thread_view.coffee | 8 ++- .../views/thread_response_view.coffee | 6 +++ lms/templates/discussion/single_thread.html | 50 ------------------- 3 files changed, 13 insertions(+), 51 deletions(-) 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 9301c3ecd4..021fa63d74 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -20,9 +20,15 @@ class @DiscussionThreadView extends Backbone.View @$(".vote-btn").addClass("is-cast") @$("span.timeago").timeago() Markdown.makeWmdEditor @$(".reply-body"), "", DiscussionUtil.urlFor("upload"), (text) -> DiscussionUtil.postMathJaxProcessor(text) + @convertMath() @renderResponses() @ + convertMath: -> + element = @$(".post-body") + element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html() + MathJax.Hub.Queue ["Typeset", MathJax.Hub, element.attr("id")] + renderResponses: -> $.ajax @model.id, success: (data, textStatus, xhr) => comments = new Comments(data['content']['children']) @@ -84,7 +90,7 @@ class @DiscussionThreadView extends Backbone.View submitComment: -> url = @model.urlFor('reply') - body = DiscussionUtil.getWmdContent @$el, $.proxy(@$, @), "reply-body" + body = @$("#wmd-input").val() response = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }) @renderResponse(response) diff --git a/lms/static/coffee/src/discussion/views/thread_response_view.coffee b/lms/static/coffee/src/discussion/views/thread_response_view.coffee index be651bc3f3..dbe6a13111 100644 --- a/lms/static/coffee/src/discussion/views/thread_response_view.coffee +++ b/lms/static/coffee/src/discussion/views/thread_response_view.coffee @@ -10,9 +10,15 @@ class @ThreadResponseView extends Backbone.View if window.user.voted(@model) @$(".vote-btn").addClass("is-cast") @$(".posted-details").timeago() + @convertMath() @renderComments() @ + convertMath: -> + element = @$(".response-body") + element.html DiscussionUtil.postMathJaxProcessor DiscussionUtil.markdownWithHighlight element.html() + MathJax.Hub.Queue ["Typeset", MathJax.Hub, element.attr("id")] + renderComments: -> @model.get("comments").each @renderComment diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html index aa67fabcb3..d70bbbc4f5 100644 --- a/lms/templates/discussion/single_thread.html +++ b/lms/templates/discussion/single_thread.html @@ -64,56 +64,6 @@ - -
From 476f4fa7ea73e62fe1001febef089e1711fa505f Mon Sep 17 00:00:00 2001 From: Matthew Mongeau Date: Thu, 30 Aug 2012 13:16:19 -0400 Subject: [PATCH 4/5] Fix liking. --- .../discussion/views/discussion_thread_view.coffee | 12 ++++++------ lms/templates/discussion/single_thread.html | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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 021fa63d74..bbe8fd1c18 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_view.coffee @@ -1,6 +1,6 @@ class @DiscussionThreadView extends Backbone.View events: - "click .discussion-vote-up": "toggleVote" + "click .discussion-vote": "toggleVote" "click .dogear": "toggleFollowing" "click .discussion-submit-post": "submitComment" template: _.template($("#thread-template").html()) @@ -10,7 +10,7 @@ class @DiscussionThreadView extends Backbone.View @$el.html(@template(@model.toJSON())) updateModelDetails: => - @$(".votes-count-number").html(@model.get("votes")["up_count"]) + @$(".discussion-vote .votes-count-number").html(@model.get("votes")["up_count"]) render: -> if window.user.following(@model) @@ -44,8 +44,8 @@ class @DiscussionThreadView extends Backbone.View @model.trigger "comment:add" toggleVote: -> - @$(".vote-btn").toggleClass("is-cast") - if @$(".vote-btn").hasClass("is-cast") + @$(".discussion-vote").toggleClass("is-cast") + if @$(".discussion-vote").hasClass("is-cast") @vote() else @unvote() @@ -68,7 +68,7 @@ class @DiscussionThreadView extends Backbone.View vote: -> url = @model.urlFor("upvote") - @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) + 1) + @$(".discussion-vote .votes-count-number").html(parseInt(@$(".discussion-vote .votes-count-number").html()) + 1) DiscussionUtil.safeAjax $elem: @$(".discussion-vote") url: url @@ -79,7 +79,7 @@ class @DiscussionThreadView extends Backbone.View unvote: -> url = @model.urlFor("unvote") - @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) - 1) + @$(".discussion-vote .votes-count-number").html(parseInt(@$(".discussion-vote .votes-count-number").html()) - 1) DiscussionUtil.safeAjax $elem: @$(".discussion-vote") url: url diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html index d70bbbc4f5..8c5aa3924f 100644 --- a/lms/templates/discussion/single_thread.html +++ b/lms/templates/discussion/single_thread.html @@ -147,7 +147,7 @@