merging inline html

lms/static/coffee/src/customwmd.coffee

@@ -102,6 +102,7 @@ $ ->
       text
 
   if Markdown?
+
     Markdown.getMathCompatibleConverter = ->
         converter = Markdown.getSanitizingConverter()
         processor = new MathJaxProcessor()
@@ -109,11 +110,13 @@ $ ->
         converter.hooks.chain "postConversion", processor.replaceMath
         converter
 
-    Markdown.makeWmdEditor = (elem, appended_id) ->
+    Markdown.makeWmdEditor = (elem, appended_id, imageUploadUrl) ->
       $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")
@@ -121,8 +124,42 @@ $ ->
                    .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)
+
+      ajaxFileUpload = (imageUploadUrl, input, startUploadHandler) ->
+        $("#loading").ajaxStart(-> $(this).show()).ajaxComplete(-> $(this).hide())
+        $("#upload").ajaxStart(-> $(this).hide()).ajaxComplete(-> $(this).show())
+        $.ajaxFileUpload
+          url: imageUploadUrl
+          secureuri: false
+          fileElementId: 'file-upload'
+          dataType: 'json'
+          success: (data, status) ->
+            fileURL = data['result']['file_url']
+            error = data['result']['error']
+            if error != ''
+              alert error
+              if startUploadHandler
+                $('#file-upload').unbind('change').change(startUploadHandler)
+              console.log error
+            else
+              $(input).attr('value', fileURL)
+          error: (data, status, e) ->
+            alert(e)
+            if startUploadHandler
+              $('#file-upload').unbind('change').change(startUploadHandler)
+              
+      imageUploadHandler = (elem, input) ->
+        console.log "here"
+        ajaxFileUpload(imageUploadUrl, input, imageUploadHandler)
+
+      editor = new Markdown.Editor(
+        converter,
+        appended_id, # idPostfix
+        null, # help handler
+        imageUploadHandler
+      )
       delayRenderer = new MathJaxDelayRenderer()
       editor.hooks.chain "onPreviewPush", (text, previewSet) ->
         delayRenderer.render

lms/static/coffee/src/discussion.coffee

@@ -43,6 +43,7 @@ Discussion =
       delete_comment      : "/courses/#{$$course_id}/discussion/comments/#{param}/delete"
       upvote_comment      : "/courses/#{$$course_id}/discussion/comments/#{param}/upvote"
       downvote_comment    : "/courses/#{$$course_id}/discussion/comments/#{param}/downvote"
+      upload              : "/courses/#{$$course_id}/discussion/upload"
       search              : "/courses/#{$$course_id}/discussion/forum/search"
     }[name]
 
@@ -89,7 +90,7 @@ Discussion =
 
       newPostBody = $(discussion).find(".new-post-body")
       if newPostBody.length
-        Markdown.makeWmdEditor newPostBody, "-new-post-body-#{$(discussion).attr('_id')}"
+        Markdown.makeWmdEditor newPostBody, "-new-post-body-#{$(discussion).attr('_id')}", Discussion.urlFor('upload')
 
     initializeWatchThreads = (index, thread) ->
       $thread = $(thread)
@@ -175,7 +176,7 @@ Discussion =
         
         $discussionContent.append(editView)
 
-        Markdown.makeWmdEditor $local(".comment-edit"), "-comment-edit-#{id}"
+        Markdown.makeWmdEditor $local(".comment-edit"), "-comment-edit-#{id}", Discussion.urlFor('upload')
       cancelReply = generateDiscussionLink("discussion-cancel-reply", "Cancel", handleCancelReply)
       submitReply = generateDiscussionLink("discussion-submit-reply", "Submit", handleSubmitReply)
       $local(".discussion-link").hide()
@@ -230,10 +231,17 @@ Discussion =
     $local(".discussion-vote-down").click ->
       handleVote(this, "down")
 
+  initializeContent: (content) ->
+    $content = $(content)
+    $local = generateLocal($content.children(".discussion-content"))
+    raw_text = $local(".content-body").html()
+    converter = Markdown.getMathCompatibleConverter()
+    $local(".content-body").html(converter.makeHtml(raw_text))
+
   bindDiscussionEvents: (discussion) ->
     $discussion = $(discussion)
     $discussionNonContent = $discussion.children(".discussion-non-content")
-    $local = (selector) -> $discussionNonContent.find(selector)
+    $local = generateLocal($discussionNonContent)#(selector) -> $discussionNonContent.find(selector)
 
     id = $discussion.attr("_id")
 
@@ -266,7 +274,9 @@ Discussion =
       $local(".new-post-form").submit()
 
     $discussion.find(".thread").each (index, thread) ->
+      Discussion.initializeContent(thread)
       Discussion.bindContentEvents(thread)
 
     $discussion.find(".comment").each (index, comment) ->
+      Discussion.initializeContent(comment)
       Discussion.bindContentEvents(comment)