From 0e194a540818842a616ddb6c82dbc85d46001fcc Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 27 Jul 2015 10:21:26 +0200
Subject: [PATCH] Added markdown to text areas

---
 rpg-docs/.meteor/packages                                  | 1 +
 rpg-docs/.meteor/versions                                  | 1 +
 rpg-docs/client/style/main.scss                            | 7 ++++++-
 .../character/features/featureDialog/featureDialog.html    | 2 +-
 rpg-docs/client/views/character/features/features.html     | 5 +++--
 rpg-docs/client/views/character/features/features.js       | 2 +-
 .../inventory/containerDialog/containerDialog.html         | 2 +-
 .../views/character/inventory/itemDialog/itemDialog.html   | 4 ++--
 .../journal/experienceDialog/experienceDialog.html         | 2 +-
 rpg-docs/client/views/character/journal/journal.html       | 2 +-
 .../views/character/journal/noteDialog/noteDialog.html     | 2 +-
 .../persona/backgroundDialog/backgroundDialog.html         | 2 +-
 rpg-docs/client/views/character/persona/persona.html       | 2 +-
 .../views/character/persona/textDialog/textDialog.html     | 2 +-
 .../views/character/spells/spellDialog/spellDialog.html    | 2 +-
 .../character/spells/spellListDialog/spellListDialog.html  | 2 +-
 16 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages
index bbd56e0f..63666300 100644
--- a/rpg-docs/.meteor/packages
+++ b/rpg-docs/.meteor/packages
@@ -27,3 +27,4 @@ fourseven:scss@2.1.1
 wolves:bourbon
 meteorhacks:subs-manager
 meteorhacks:kadira
+chuangbo:marked
diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions
index d99c6a38..f890e0c5 100644
--- a/rpg-docs/.meteor/versions
+++ b/rpg-docs/.meteor/versions
@@ -14,6 +14,7 @@ blaze-tools@1.0.3
 boilerplate-generator@1.0.3
 callback-hook@1.0.3
 check@1.0.5
+chuangbo:marked@0.3.5
 coffeescript@1.0.6
 dburles:collection-helpers@1.0.3
 dburles:mongo-collection-instances@0.3.3
diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss
index 77a3172f..5006ac3b 100644
--- a/rpg-docs/client/style/main.scss
+++ b/rpg-docs/client/style/main.scss
@@ -29,6 +29,11 @@ core-header-panel[drawer] {
 	box-shadow: 2px 0px 5px 0px rgba(0,0,0,0.2);
 }
 
+//Paragraphs
+p {
+	margin-bottom: 8px;
+}
+
 //Horizontal rule
 hr {
 	background-color: #444;
@@ -37,7 +42,7 @@ hr {
 	color: #444;
 	height: 1px;
 	line-height: 0;
-	margin: 16px -16px;
+	margin: 16px 0;
 	text-align: center;
 }
 
diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
index 1ee51cd8..500da4f9 100644
--- a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
+++ b/rpg-docs/client/views/character/features/featureDialog/featureDialog.html
@@ -32,7 +32,7 @@
 	{{/if}}
 
 	{{#if description}}
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 
 	{{> effectsViewList charId=charId parentId=_id}}
diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html
index 5726c166..165bd73a 100644
--- a/rpg-docs/client/views/character/features/features.html
+++ b/rpg-docs/client/views/character/features/features.html
@@ -102,8 +102,9 @@
 							{{/if}}
 						</div>
 						{{#if description}}
-							<div flex class="bottom text"
-								 >{{evaluateString charId shortDescription}}</div>
+							<div flex class="bottom">
+								{{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}}
+							</div>
 						{{/if}}
 						{{#if hasUses}}
 							<div layout horizontal center end-justified>
diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/character/features/features.js
index a0b1f329..99687f39 100644
--- a/rpg-docs/client/views/character/features/features.js
+++ b/rpg-docs/client/views/character/features/features.js
@@ -5,7 +5,7 @@ Template.features.helpers({
 	},
 	shortDescription: function() {
 		if (_.isString(this.description)){
-			return this.description.split(/[\n\r]{3,}/)[0];
+			return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0];
 		}
 	},
 	hasUses: function(){
diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
index dfcf1ca1..2682fa5e 100644
--- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
+++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html
@@ -41,6 +41,6 @@
 	</div>
 	{{#if description}}
 		<hr class="vertMargin">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 </template>
diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
index 3b67667d..bab6cea1 100644
--- a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
+++ b/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
@@ -18,8 +18,8 @@
 		{{#if requiresAttunement}}<div class="vertMargin">Requires Attunement</div>{{/if}}
 	</div>
 	{{#if description}}
-		<hr class="vertMargin">
-		<div class="pre-wrap">{{evaluateString charId description}}</div>
+		<hr style="margin: 16px 0 16px 0;">
+		<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{/if}}
 	{{> effectsViewList charId=charId parentId=_id}}
 	{{> attacksViewList charId=charId parentId=_id}}
diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
index 600361f6..6573d590 100644
--- a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
+++ b/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html
@@ -6,7 +6,7 @@
 			</div>
 			{{#if description}}
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{description}}</div>
+				<div>{{#markdown}}{{description}}{{/markdown}}</div>
 			{{/if}}
 		{{else}}
 			{{> experienceEdit}}
diff --git a/rpg-docs/client/views/character/journal/journal.html b/rpg-docs/client/views/character/journal/journal.html
index 6d2a048a..2f69fb6e 100644
--- a/rpg-docs/client/views/character/journal/journal.html
+++ b/rpg-docs/client/views/character/journal/journal.html
@@ -87,7 +87,7 @@
 							 layout horizontal center>
 							{{name}}
 						</div>
-						<div class="bottom text">{{description}}</div>
+						<div class="bottom">{{#markdown}}{{description}}{{/markdown}}</div>
 					</paper-shadow>
 				{{/each}}
 			</div>
diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
index 754a9a7b..ecb6c682 100644
--- a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
+++ b/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html
@@ -1,7 +1,7 @@
 <template name="noteDialog">
 	{{#with note}}
 		{{#baseDialog title=name class=colorClass startEditing=../startEditing}}
-			<div class="pre-wrap">{{description}}</div>
+			<div>{{#markdown}}{{description}}{{/markdown}}</div>
 		{{else}}
 			{{> noteDialogEdit}}
 		{{/baseDialog}}
diff --git a/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html b/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
index 8bbf52ff..4236ea94 100644
--- a/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
+++ b/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html
@@ -1,6 +1,6 @@
 <template name="backgroundDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true"}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 		{{> proficiencyViewList charId=charId parentId=charId parentGroup="background"}}
 	{{else}}
 		{{> textDialogEdit}}
diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html
index b8a8cb52..b1762e50 100644
--- a/rpg-docs/client/views/character/persona/persona.html
+++ b/rpg-docs/client/views/character/persona/persona.html
@@ -68,6 +68,6 @@
               {{title}}
           </div>
 		</div>
-		<div class="bottom text">{{> UI.contentBlock}}</div>
+		<div class="bottom">{{#markdown}}{{> UI.contentBlock}}{{/markdown}}</div>
 	</paper-shadow>
 </template>
\ No newline at end of file
diff --git a/rpg-docs/client/views/character/persona/textDialog/textDialog.html b/rpg-docs/client/views/character/persona/textDialog/textDialog.html
index e64162f2..215d6a92 100644
--- a/rpg-docs/client/views/character/persona/textDialog/textDialog.html
+++ b/rpg-docs/client/views/character/persona/textDialog/textDialog.html
@@ -1,6 +1,6 @@
 <template name="textDialog">
 	{{#baseDialog title=title class=colorClass hideColor="true" hideDelete="true" startEditing=startEditing}}
-		<div class="pre-wrap">{{evaluateString charId value}}</div>
+		<div>{{#markdown}}{{evaluateString charId value}}{{/markdown}}</div>
 	{{else}}
 		{{> textDialogEdit}}
 	{{/baseDialog}}
diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
index 6a4577fb..6f270176 100644
--- a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
+++ b/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html
@@ -34,7 +34,7 @@
 		</div>
 		{{/if}}
 	</div>
-	<div class="pre-wrap">{{evaluateString charId description}}</div>
+	<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 	{{> attacksViewList charId=charId parentId=_id}}
 </template>
 
diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
index f5f7cbfb..3bed65e6 100644
--- a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
+++ b/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html
@@ -20,7 +20,7 @@
 					{{/if}}
 				</div>
 				<hr class="vertMargin">
-				<div class="pre-wrap">{{evaluateString charId description}}</div>
+				<div>{{#markdown}}{{evaluateString charId description}}{{/markdown}}</div>
 			</div>
 		{{else}}
 			<!--Name-->