use marked.js to render MD

swcool · Apr 26, 2013 · 38abbc5 · 38abbc5
1 parent 6d72fef
commit 38abbc5
Show file tree

Hide file tree

Showing 4 changed files with 792 additions and 1,347 deletions.
diff --git a/manifest.json b/manifest.json
@@ -10,7 +10,7 @@
 	},
 	"permissions": ["tabs", "\u003Call_urls\u003E"],
 	"content_scripts": [{
-		"js": ["prettify.js", "showdown.js", "markdownreader.js"],
+		"js": ["prettify.js", "markdownreader.js","marked.js"],
 		"matches": ["*://*/*.md", "file://*/*.md", "*://*/*.markdown", "file://*/*.markdown", "*://*/*.mdown", "file://*/*.mdown", "*://*/*.mkdn", "file://*/*.mkdn", "*://*/*.mkd", "file://*/*.mkd", "*://*/*.text", "file://*/*.text", "*://*/*.mdtext", "file://*/*.mdtext", "*://*/*.mdtxt", "file://*/*.mdtxt"],
 		"run_at": "document_end"
 	}],

diff --git a/markdownreader.js b/markdownreader.js
@@ -11,21 +11,26 @@
 	link.rel = 'stylesheet';
 	link.href = chrome.extension.getURL('prettify.css');
 	document.head.appendChild(link);
-	document.body.innerHTML = '<div id="markdown-container"></div><div id="markdown-outline">'+ 
+	document.body.innerHTML = '<div id="markdown-container"></div><div id="markdown-outline">'+
                             '</div><div id="markdown-backTop" onclick="window.scrollTo(0,0);">'+
                             '</div><div id="markdown-bottom" onclick="window.scrollTo(0, document.body.scrollHeight);"></div>'+
                             '<div id="markdown-raw" onclick="window.location=\'view-source:\' + window.location.href;"></div>';
 
 	window.onresize = showOutline;
 
-	var markdownConverter = new Showdown.converter();
+	//var markdownConverter = new Showdown.converter();
 	var lastText = null;
 
 	function updateMarkdown(text) {
 		if (text !== lastText) {
+			marked.setOptions({
+				gfm: true,
+				pedantic: false,
+				sanitize: false
+			});
 			lastText = text;
-			markdownConverter.makeHtml(lastText)
-			document.getElementById('markdown-container').innerHTML = markdownConverter.makeHtml(lastText);
+			//markdownConverter.makeHtml(lastText)
+			document.getElementById('markdown-container').innerHTML = marked(lastText);
 			prettyPrint();
 			updateOutline();
 		}
@@ -70,7 +75,7 @@
 			outline.innerHTML = arrOutline.join('');
 			showOutline();
 		}
-		else outline.style.display = 'none'; 
+		else outline.style.display = 'none';
 	}
 
 	function showOutline() {