From 27f125ecf5e63b9aa82e6338a0d1a34f7587fc6b Mon Sep 17 00:00:00 2001
From: Alex Weiksnar <alex@zooniverse.org>
Date: Thu, 20 Aug 2015 14:18:07 -0500
Subject: [PATCH 1/4] Pass project to markdown component

- Cooresponds with https://github.com/zooniverse-ui/markdownz/pull/12
---
 app/pages/lab/project-details.cjsx    | 2 +-
 app/pages/project/education.cjsx      | 2 +-
 app/pages/project/faq.cjsx            | 2 +-
 app/pages/project/home.cjsx           | 2 +-
 app/pages/project/research.cjsx       | 2 +-
 app/pages/project/results.cjsx        | 2 +-
 app/partials/project-page-editor.cjsx | 1 +
 app/talk/comment-box.cjsx             | 2 +-
 app/talk/discussion.cjsx              | 1 +
 9 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/pages/lab/project-details.cjsx b/app/pages/lab/project-details.cjsx
index 9cccb00566..435137dbda 100644
--- a/app/pages/lab/project-details.cjsx
+++ b/app/pages/lab/project-details.cjsx
@@ -153,7 +153,7 @@ module.exports = React.createClass
             <AutoSave resource={@props.project}>
               <span className="form-label">Introduction</span>
               <br />
-              <MarkdownEditor className="full" name="introduction" rows="10" value={@props.project.introduction} onChange={handleInputChange.bind @props.project} onHelp={markdownHelp}/>
+              <MarkdownEditor className="full" name="introduction" rows="10" value={@props.project.introduction} project={@props.project} onChange={handleInputChange.bind @props.project} onHelp={markdownHelp}/>
             </AutoSave>
             <small className="form-help">Add a brief introduction to get people interested in your project. This will display on your landing page.</small>
           </p>
diff --git a/app/pages/project/education.cjsx b/app/pages/project/education.cjsx
index 6076623099..4493e2ffa1 100644
--- a/app/pages/project/education.cjsx
+++ b/app/pages/project/education.cjsx
@@ -13,7 +13,7 @@ module.exports = React.createClass
   render: ->
     <div className="project-text-content content-container">
       <PromiseRenderer promise={@props.project.get('pages', url_key: "education").index(0)}>{(education) =>
-        <Markdown className="column">{
+        <Markdown project={@props.project} className="column">{
           if education?.content
             education?.content
           else
diff --git a/app/pages/project/faq.cjsx b/app/pages/project/faq.cjsx
index 1a88915fab..ebd4f36edb 100644
--- a/app/pages/project/faq.cjsx
+++ b/app/pages/project/faq.cjsx
@@ -13,7 +13,7 @@ module.exports = React.createClass
   render: ->
     <div className="project-text-content content-container">
       <PromiseRenderer promise={@props.project.get('pages', url_key: "faq").index(0)}>{(faq) =>
-        <Markdown className="column">{
+        <Markdown project={@props.project} className="column">{
           if faq?.content
             faq?.content
           else
diff --git a/app/pages/project/home.cjsx b/app/pages/project/home.cjsx
index e1b6d9adc1..43ec3536af 100644
--- a/app/pages/project/home.cjsx
+++ b/app/pages/project/home.cjsx
@@ -55,6 +55,6 @@ module.exports = React.createClass
       <hr />
       <div className="introduction content-container">
         <h3 className="about-project">About {@props.project.display_name}</h3>
-        <Markdown>{@props.project.introduction ? ''}</Markdown>
+        <Markdown project={@props.project}>{@props.project.introduction ? ''}</Markdown>
       </div>
     </div>
diff --git a/app/pages/project/research.cjsx b/app/pages/project/research.cjsx
index 63af7f5681..78b5f33333 100644
--- a/app/pages/project/research.cjsx
+++ b/app/pages/project/research.cjsx
@@ -27,7 +27,7 @@ module.exports = React.createClass
     <div className="project-text-content content-container">
       <div className="columns-container">
         <PromiseRenderer promise={@props.project.get('pages', url_key: "science_case").index(0)}>{(science_case) =>
-          <Markdown className="column">{
+          <Markdown project={@props.project} className="column">{
             if science_case?.content
               science_case?.content
             else
diff --git a/app/pages/project/results.cjsx b/app/pages/project/results.cjsx
index 1445812335..2220e7a1ae 100644
--- a/app/pages/project/results.cjsx
+++ b/app/pages/project/results.cjsx
@@ -13,7 +13,7 @@ module.exports = React.createClass
   render: ->
     <div className="project-text-content content-container">
       <PromiseRenderer promise={@props.project.get('pages', url_key: "result").index(0)}>{(faq) =>
-        <Markdown className="column">{
+        <Markdown project={@props.project} className="column">{
           if faq?.content
             faq?.content
           else
diff --git a/app/partials/project-page-editor.cjsx b/app/partials/project-page-editor.cjsx
index 1906f175c9..73ff14462a 100644
--- a/app/partials/project-page-editor.cjsx
+++ b/app/partials/project-page-editor.cjsx
@@ -46,6 +46,7 @@ module.exports = React.createClass
            <br />
            <ChangeListener target={@state.pageContent}>{ =>
              <MarkdownEditor
+               project={@props.project}
                onHelp={markdownHelp}
                className="full"
                name="content"
diff --git a/app/talk/comment-box.cjsx b/app/talk/comment-box.cjsx
index 22dec08e6b..6edab0f6e5 100644
--- a/app/talk/comment-box.cjsx
+++ b/app/talk/comment-box.cjsx
@@ -82,7 +82,7 @@ module?.exports = React.createClass
         <img className="talk-comment-focus-image" src={getSubjectLocation(@state.subject).src} />}
 
       <form className="talk-comment-form" onSubmit={@onSubmitComment}>
-        <MarkdownEditor placeholder={@props.placeholder} className="full" value={@state.content} onChange={@onInputChange} onHelp={-> alert <CommentHelp /> }/>
+        <MarkdownEditor placeholder={@props.placeholder} project={@props.project} className="full" value={@state.content} onChange={@onInputChange} onHelp={-> alert <CommentHelp /> }/>
 
         <section>
           <button
diff --git a/app/talk/discussion.cjsx b/app/talk/discussion.cjsx
index 0a9b79b9ee..cdaa0b52cb 100644
--- a/app/talk/discussion.cjsx
+++ b/app/talk/discussion.cjsx
@@ -295,6 +295,7 @@ module?.exports = React.createClass
 
           <CommentBox
             user={@props.user}
+            project={@props.project}
             validationCheck={@commentValidations}
             validationErrors={@state.commentValidationErrors}
             onSubmitComment={@onSubmitComment}

From 29986332420a25a9c2a7312933e3338ef71c6232 Mon Sep 17 00:00:00 2001
From: Alex Weiksnar <alex@zooniverse.org>
Date: Thu, 20 Aug 2015 15:20:52 -0500
Subject: [PATCH 2/4] Update markdownz to 2.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 98d461d135..c9247d2547 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "lodash.intersection": "~3.2.0",
     "lodash.merge": "~2.4.1",
     "lodash.pick": "~3.1.0",
-    "markdownz": "^1.0.0",
+    "markdownz": "^2.0.0",
     "modal-form": "~0.0.1",
     "moment": "~2.9.0",
     "papaparse": "mholt/PapaParse#cada171",

From 90541dc4c66bab4629cfe53cd09689dc6e6ac4e0 Mon Sep 17 00:00:00 2001
From: Alex Weiksnar <alex@zooniverse.org>
Date: Thu, 20 Aug 2015 16:08:44 -0500
Subject: [PATCH 3/4] Update comment help text

---
 app/talk/comment-help.cjsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/talk/comment-help.cjsx b/app/talk/comment-help.cjsx
index 360b8ce212..efb1a6dad1 100644
--- a/app/talk/comment-help.cjsx
+++ b/app/talk/comment-help.cjsx
@@ -8,6 +8,6 @@ module?.exports = React.createClass
       <h1>Guide to commenting on talk</h1>
       <p>Talk comments are written in <a href='http://daringfireball.net/projects/markdown/basics'>markdown</a></p>
       <p>Mention users with <em>@username</em></p>
-      <p>Mention subjects with <em>@owner/project^subject_id</em> or with <em>^subject_id</em> if you are inside of the subject's talk</p>
+      <p>Mention subjects with <em>@owner/project^S<subject_id></em> or with <em>^S<subject_id></em> if you are inside of the subject's talk</p>
       <p>Create hashtags with <em>#hashtag</em></p>
     </div>

From e3fb549a7fe29faf732ffc97fcd789d779043cb0 Mon Sep 17 00:00:00 2001
From: Alex Weiksnar <alex@zooniverse.org>
Date: Wed, 26 Aug 2015 12:32:59 -0500
Subject: [PATCH 4/4] Use markdown renderer instead of comment-preview

---
 app/talk/comment-box.cjsx   | 1 -
 app/talk/comment.cjsx       | 5 ++---
 app/talk/discussion.cjsx    | 1 +
 app/talk/search-result.cjsx | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/talk/comment-box.cjsx b/app/talk/comment-box.cjsx
index 6edab0f6e5..6ae3f2f19b 100644
--- a/app/talk/comment-box.cjsx
+++ b/app/talk/comment-box.cjsx
@@ -1,7 +1,6 @@
 React = require 'react'
 ToggleChildren = require './mixins/toggle-children'
 Feedback = require './mixins/feedback'
-CommentPreview = require './comment-preview'
 CommentHelp = require './comment-help'
 CommentImageSelector = require './comment-image-selector'
 getSubjectLocation = require '../lib/get-subject-location'
diff --git a/app/talk/comment.cjsx b/app/talk/comment.cjsx
index 6efdd625fd..2ba374687e 100644
--- a/app/talk/comment.cjsx
+++ b/app/talk/comment.cjsx
@@ -7,7 +7,6 @@ CommentBox = require './comment-box'
 CommentReportForm = require './comment-report-form'
 CommentLink = require './comment-link'
 upvotedByCurrentUser = require './lib/upvoted-by-current-user'
-CommentPreview = require './comment-preview'
 PromiseRenderer = require '../components/promise-renderer'
 {Link} = require 'react-router'
 {timestamp} = require './lib/time'
@@ -17,7 +16,7 @@ Avatar = require '../partials/avatar'
 SubjectViewer = require '../components/subject-viewer'
 DisplayRoles = require './lib/display-roles'
 merge = require 'lodash.merge'
-
+{Markdown} = require 'markdownz'
 DEFAULT_AVATAR = './assets/simple-avatar.jpg'
 
 module?.exports = React.createClass
@@ -133,7 +132,7 @@ module?.exports = React.createClass
                 catch={null}
                 />}
 
-            <CommentPreview content={@props.data.body} header={null}/>
+            <Markdown content={@props.data.body} project={@props.project} header={null}/>
 
             <div className="talk-comment-links">
               <button className="talk-comment-like-button" onClick={@onClickLike}>
diff --git a/app/talk/discussion.cjsx b/app/talk/discussion.cjsx
index cdaa0b52cb..80451ba7b2 100644
--- a/app/talk/discussion.cjsx
+++ b/app/talk/discussion.cjsx
@@ -154,6 +154,7 @@ module?.exports = React.createClass
   comment: (data, i) ->
     <Comment
       {...@props}
+      project={@props.project}
       key={data.id}
       data={data}
       active={+data.id is +@props.query?.comment}
diff --git a/app/talk/search-result.cjsx b/app/talk/search-result.cjsx
index 555c7554f1..9aa64ba587 100644
--- a/app/talk/search-result.cjsx
+++ b/app/talk/search-result.cjsx
@@ -1,10 +1,10 @@
 React = require 'react'
 DiscussionPreview = require './discussion-preview'
 CommentLink = require './comment-link'
-CommentPreview = require './comment-preview'
 PromiseRenderer = require '../components/promise-renderer'
 parseSection = require './lib/parse-section'
 apiClient = require '../api/client'
+{Markdown} = require 'markdownz'
 
 # This isn't very reuseable as it's prop is a comment resource with it's
 # linked discussion added on. Probably a better way to approach this.
@@ -27,7 +27,7 @@ module.exports = React.createClass
 
     <div className="talk-search-result talk-module">
       <CommentLink comment={comment}>{comment.discussion_title}</CommentLink>
-      <CommentPreview content={comment.body} header={null} />
+      <Markdown content={comment.body} />
       {if section is 'zooniverse'
         <DiscussionPreview {...@props} discussion={discussion} comment={comment} />
       else