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

lms/static/coffee/src/customwmd.coffee

@@ -6,10 +6,6 @@ $ ->
 
   class MathJaxProcessor
 
-    inlineMark = "$"
-    math = null
-    blocks = null
-
     MATHSPLIT = /// (
       \$\$?                          # normal inline or display delimiter
       | \\(?:begin|end)\{[a-z]*\*?\} # \begin{} \end{} style
@@ -27,33 +23,26 @@ $ ->
       (?!`)
     ///gm
 
-    ###HUB.Queue ->
-      console.log "initializing"
-      renderReady = true
-      HUB.processUpdateTime = 50
-      HUB.Config
-        "HTML-CSS":
-          EqnChunk: 10
-          EqnChunkFactor: 1
-        SVG:
-          EqnChunk: 10
-          EqnChunkFactor: 1
-    ###
-
-    @processMath: (start, last, preProcess) =>
-      block = blocks.slice(start, last + 1).join("").replace(/&/g, "&")
+    constructor: (inlineMark, displayMark) ->
+      @inlineMark = inlineMark || "$"
+      @displayMark = displayMark || "$$"
+      @math = null
+      @blocks = null
+
+    processMath: (start, last, preProcess) ->
+      block = @blocks.slice(start, last + 1).join("").replace(/&/g, "&")
                                                     .replace(/</g, "&lt;")
                                                     .replace(/>/g, "&gt;")
       if HUB.Browser.isMSIE
         block = block.replace /(%[^\n]*)\n/g, "$1<br/>\n"
-      blocks[i] = "" for i in [start+1..last]
-      blocks[start] = "@@#{math.length}@@"
+      @blocks[i] = "" for i in [start+1..last]
+      @blocks[start] = "@@#{@math.length}@@"
       block = preProcess(block) if preProcess
-      math.push block
+      @math.push block
 
-    @removeMath: (text) =>
+    removeMath: (text) ->
 
-      math = []
+      @math = []
       start = end = last = null
       braces = 0
 
@@ -67,13 +56,13 @@ $ ->
       else
         deTilde = (text) -> text
 
-      blocks = _split(text.replace(/\r\n?/g, "\n"), MATHSPLIT)
+      @blocks = _split(text.replace(/\r\n?/g, "\n"), MATHSPLIT)
 
-      for current in [1...blocks.length] by 2
-        block = blocks[current]
+      for current in [1...@blocks.length] by 2
+        block = @blocks[current]
         if block.charAt(0) == "@"
-          blocks[current] = "@@#{math.length}@@"
-          math.push block
+          @blocks[current] = "@@#{@math.length}@@"
+          @math.push block
         else if start
           if block == end
             if braces
@@ -92,7 +81,7 @@ $ ->
           else if block == "}" and braces
             --braces
         else
-          if block == inlineMark or block == "$$"
+          if block == @inlineMark or block == @displayMark
             start = current
             end = block
             braces = 0
@@ -105,75 +94,38 @@ $ ->
         @processMath(start, last, deTilde)
         start = end = last = null
 
-      deTilde(blocks.join(""))
+      deTilde(@blocks.join(""))
 
-    @replaceMath: (text) =>
-      text = text.replace /@@(\d+)@@/g, ($0, $1) => math[$1]
-      math = null
+    replaceMath: (text) ->
+      text = text.replace /@@(\d+)@@/g, ($0, $1) => @math[$1]
+      @math = null
       text
 
-    @updateMathJax: =>
-      HUB.Queue(["Typeset", HUB, "wmd-preview"])
-      
-          
-
-    ###
-    if not HUB.Cancel? #and 1 == 2
-      HUB.cancelTypeset = false
-      CANCELMESSAGE = "MathJax Canceled"
-
-      HOOKS = [
-        {
-          name: "HTML-CSS Jax Config"
-          engine: -> window["MathJax"].OutputJax["HTML-CSS"]
-        },
-        {
-          name: "SVG Jax Config"
-          engine: -> window["MathJax"].OutputJax["SVG"]
-        },
-        {
-          name: "TeX Jax Config"
-          engine: -> window["MathJax"].InputJax.TeX
-        },
-      ]
-      
-      for hook in HOOKS
-        do (hook) ->
-          HUB.Register.StartupHook hook.name, ->
-            engine = hook.engine()
-            engine.Augment
-              Translate: (script, state) ->
-                console.log "translating"
-                if HUB.cancelTypeset or state.cancelled
-                  throw Error(CANCELMESSAGE)
-                engine.Translate.call(engine, script, state)
-
-      prevProcessError = HUB.processError
-      HUB.processError = (error, state, type) ->
-        if error.message != CANCELMESSAGE
-          return prevProcessError.call(HUB, error, state, type)
-        else
-          console.log "handling message"
-          MathJax.Message.Clear(0, 0)
-          state.jaxIds = []
-          state.jax = {}
-          state.scripts = []
-          state.i = state.j = 0
-          state.cancelled = true
-          return null
-
-      HUB.Cancel = ->
-          this.cancelTypeset = true
-  ###
-  
   if Markdown?
-    converter = Markdown.getSanitizingConverter()
-    editor = new Markdown.Editor(converter)
-    converter.hooks.chain "preConversion", MathJaxProcessor.removeMath
-    converter.hooks.chain "postConversion", MathJaxProcessor.replaceMath
-    delayRenderer = new MathJaxDelayRenderer()
-    editor.hooks.chain "onPreviewPush", (text, previewSet) ->
-      delayRenderer.render
-        text: text
-        previewSetter: previewSet
-    editor.run()
+    Markdown.getMathCompatibleConverter = ->
+        converter = Markdown.getSanitizingConverter()
+        processor = new MathJaxProcessor()
+        converter.hooks.chain "preConversion", processor.removeMath
+        converter.hooks.chain "postConversion", processor.replaceMath
+        converter
+
+    Markdown.makeWmdEditor = (elem, appended_id) ->
+      $elem = $(elem)
+      if not $elem.length
+        console.log "warning: elem for makeWmdEditor doesn't exist"
+        return
+      if not $elem.find(".wmd-panel").length
+        _append = appended_id || ""
+        $wmdPanel = $("<div>").addClass("wmd-panel")
+                   .append($("<div>").attr("id", "wmd-button-bar#{_append}"))
+                   .append($("<textarea>").addClass("wmd-input").attr("id", "wmd-input#{_append}"))
+                   .append($("<div>").attr("id", "wmd-preview#{_append}").addClass("wmd-panel wmd-preview"))
+        $elem.append($wmdPanel)
+      converter = Markdown.getMathCompatibleConverter()
+      editor = new Markdown.Editor(converter, appended_id)
+      delayRenderer = new MathJaxDelayRenderer()
+      editor.hooks.chain "onPreviewPush", (text, previewSet) ->
+        delayRenderer.render
+          text: text
+          previewSetter: previewSet
+      editor.run()

lms/static/coffee/src/discussion.coffee

@@ -13,6 +13,7 @@ $ ->
     Discussion.bindDiscussionEvents(discussion)
     Discussion.initializeDiscussion(discussion)
 
+
 generateLocal = (elem) ->
   (selector) -> $(elem).find(selector)
 
@@ -50,6 +51,7 @@ Discussion =
     window.location.reload()
 
   initializeDiscussion: (discussion) ->
+
     initializeVote = (index, content) ->
       $content = $(content)
       $local = generateLocal($content.children(".discussion-content"))
@@ -85,6 +87,10 @@ Discussion =
         watchDiscussion = generateDiscussionLink("discussion-watch-discussion", "Watch", handleWatchDiscussion)
         $local(".discussion-title-wrapper").append(watchDiscussion)
 
+      newPostBody = $(discussion).find(".new-post-body")
+      if newPostBody.length
+        Markdown.makeWmdEditor newPostBody, "-new-post-body-#{$(discussion).attr('_id')}"
+
     initializeWatchThreads = (index, thread) ->
       $thread = $(thread)
       id = $thread.attr("_id")
@@ -147,7 +153,7 @@ Discussion =
       else
         editView = $("<div>").addClass("discussion-content-edit")
 
-        textarea = $("<textarea>").addClass("comment-edit")
+        textarea = $("<div>").addClass("comment-edit")
         editView.append(textarea)
 
         anonymousCheckbox = $("<input>").attr("type", "checkbox")
@@ -156,7 +162,8 @@ Discussion =
         anonymousLabel = $("<label>").attr("for", "discussion-post-anonymously-#{id}")
                                      .html("post anonymously")
         editView.append(anonymousCheckbox).append(anonymousLabel)
-        
+
+
         if $discussionContent.parent(".thread").attr("_id") not in $$user_info.subscribed_thread_ids
           watchCheckbox = $("<input>").attr("type", "checkbox")
                                       .addClass("discussion-auto-watch")
@@ -167,6 +174,8 @@ Discussion =
           editView.append(watchCheckbox).append(watchLabel)
         
         $discussionContent.append(editView)
+
+        Markdown.makeWmdEditor $local(".comment-edit"), "-comment-edit-#{id}"
       cancelReply = generateDiscussionLink("discussion-cancel-reply", "Cancel", handleCancelReply)
       submitReply = generateDiscussionLink("discussion-submit-reply", "Submit", handleSubmitReply)
       $local(".discussion-link").hide()
@@ -190,7 +199,8 @@ Discussion =
         url = Discussion.urlFor('create_sub_comment', id)
       else
         return
-      body = $local(".comment-edit").val()
+
+      body = $local("#wmd-input-comment-edit-#{id}").val()
 
       anonymous = false || $local(".discussion-post-anonymously").is(":checked")
       autowatch = false || $local(".discussion-auto-watch").is(":checked")
@@ -225,6 +235,8 @@ Discussion =
     $discussionNonContent = $discussion.children(".discussion-non-content")
     $local = (selector) -> $discussionNonContent.find(selector)
 
+    id = $discussion.attr("_id")
+
     handleSearch = (text, isSearchWithinBoard) ->
       if text.length
         if $local(".discussion-search-within-board").is(":checked")
@@ -234,7 +246,7 @@ Discussion =
 
     handleSubmitNewThread = (elem) ->
       title = $local(".new-post-title").val()
-      body = $local(".new-post-body").val()
+      body = $local("#wmd-input-new-post-body-#{id}").val()
       url = Discussion.urlFor('create_thread', $local(".new-post-form").attr("_id"))
       $.post url, {title: title, body: body}, (response, textStatus) ->
         if textStatus == "success"

lms/static/coffee/src/mathjax_delay_renderer.coffee

@@ -13,9 +13,7 @@ class @MathJaxDelayRenderer
   constructor: (params) ->
     params = params || {}
     @maxDelay = params["maxDelay"] || @maxDelay
-    @bufferId = params["buffer"] || @bufferId
-    if not $("##{@bufferId}").length
-      $("<div>").attr("id", @bufferId).css("display", "none").appendTo($("body"))
+    @$buffer = $("<div>").attr("id", @bufferId).css("display", "none").appendTo($("body"))
 
   # render: (params) ->
   # params:
@@ -35,7 +33,6 @@ class @MathJaxDelayRenderer
     if not text?
       text = $(elem).html()
     preprocessor = params["preprocessor"]
-    buffer = $("##{@bufferId}")
 
     if params["delay"] == false
       if preprocessor?
@@ -54,20 +51,20 @@ class @MathJaxDelayRenderer
         prevTime = getTime()
         if preprocessor?
           text = preprocessor(text)
-        buffer.html(text)
+        @$buffer.html(text)
         curTime = getTime()
         @elapsedTime = curTime - prevTime
         if MathJax
           prevTime = getTime()
           @mathjaxRunning = true
-          MathJax.Hub.Queue ["Typeset", MathJax.Hub, buffer.attr("id")], =>
+          MathJax.Hub.Queue ["Typeset", MathJax.Hub, @$buffer.attr("id")], =>
             @mathjaxRunning = false
             curTime = getTime()
             @mathjaxDelay = curTime - prevTime
             if previewSetter
-              previewSetter($(buffer).html())
+              previewSetter($(@$buffer).html())
             else
-              $(elem).html($(buffer).html())
+              $(elem).html($(@$buffer).html())
         else
           @mathjaxDelay = 0
       @mathjaxTimeout = window.setTimeout(renderer, delay)

lms/static/sass/_discussion.scss

@@ -91,6 +91,7 @@ $discussion_input_width: 60%;
   .discussion-right-wrapper {
     min-height: 40px;
     float: left;
+    width: 70%;
   }
   .new-post-form {
     .new-post-title, .new-post-body {
@@ -190,7 +191,6 @@ $discussion_input_width: 60%;
 
 .wmd-panel
 {
-  margin-left: 25%;
   margin-right: 25%;
   width: 50%;
   min-width: 500px;

lms/templates/discussion/inline.html

@@ -8,14 +8,10 @@
     ${search_bar}
     <form class="new-post-form" _id="${discussion_id}">
       <input type="text" class="new-post-title" placeholder="Title"/>
-      <textarea class="new-post-body"></textarea>
+      <div class="new-post-body">
+      </div>
       <a class="discussion-new-post" href="javascript:void(0)">New Post</a>
-        <div class="wmd-panel">
-          <div id="wmd-button-bar"></div>
-          <textarea class="wmd-input" id="wmd-input">
-          </textarea>
-          <div id="wmd-preview" class="wmd-panel wmd-preview"></div>
-        </div>
+        
     </form>
   </div>
   % for thread in threads:

lms/templates/discussion/thread.html

@@ -41,14 +41,16 @@
   % for comment in comments:
     <div class="comment" _id="${comment['id']}">
       <div class="discussion-content">
-        ${render_vote(comment)}
-        <div class="discussion-right-wrapper">
-          <div class="discussion-content-view">
-            <a class="comment-body" name="${comment['id']}">${comment['body']}</a>
-            <div class="info">
-              ${render_info(comment)}
-              ${render_reply()}
-              ${render_edit()}
+        <div class="discussion-upper-wrapper clearfix">
+          ${render_vote(comment)}
+          <div class="discussion-right-wrapper">
+            <div class="discussion-content-view">
+              <a class="comment-body" name="${comment['id']}">${comment['body']}</a>
+              <div class="info">
+                ${render_info(comment)}
+                ${render_reply()}
+                ${render_edit()}
+              </div>
             </div>
           </div>
         </div>