fixed #11, support .

hotoo · Nov 2, 2014 · 1cc84d8 · 1cc84d8
1 parent bc90339
commit 1cc84d8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/examples/data.mdown b/examples/data.mdown
@@ -17,6 +17,7 @@
 * 2000 this is **strong**, and __strong2__
 * 2000 this is *em*, and _em2_
 * 2000 this is ~delete~, and ~~delete2~~
+* 2000 this is `code` and `another code`.
 
 ## @Memthon and #HashTags
 

diff --git a/markline.js b/markline.js
@@ -68,6 +68,7 @@ function parseMarkdown(markdown, meta){
   var RE_STRONG = /(\*\*|__)(.*?)\1/g;
   var RE_EM = /(\*|_)(.*?)\1/g;
   var RE_DELETE = /(\~\~?)(.*?)\1/g;
+  var RE_CODE = /`([^`]+)`/g
   var RE_MENTION = /(^|[^a-zA-Z0-9])@([^\s\t,\(\)\[\]\{\}]+)/g;
   var RE_MENTION_PLACEHOLDER = /\{@mention\}/ig;
   var RE_HASHTAG = /(?:^|[\s\t])\#([^\s\t]+)/g;
@@ -78,6 +79,7 @@ function parseMarkdown(markdown, meta){
   html = html.replace(RE_STRONG, '<strong>$2</strong>');
   html = html.replace(RE_EM, '<em>$2</em>');
   html = html.replace(RE_DELETE, '<del>$2</del>');
+  html = html.replace(RE_CODE, '<code>$1</code>');
 
   // mention:
   if (meta.mention) {

diff --git a/timeline.css b/timeline.css
@@ -219,6 +219,15 @@
   font-style: italic;
   color: #999;
 }
+.markline > section > .events code {
+  font-size: 13px;
+  color: rgba(0, 0, 0, 0.75);
+  background-color: #999;
+  padding: 1px 3px;
+  border-radius: 3px;
+  margin-left: 3px;
+  margin-right: 3px;
+}
 .markline > section > .events a {
   color: #6EA3D0;
   text-decoration: none;