From 1fd6610fa3a09dfc6344bc7eb2a2c7e66c8dc73d Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Thu, 7 May 2015 00:02:54 +0800
Subject: [PATCH] =?UTF-8?q?#133=20=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98,=20=E6=9B=B4=E6=96=B0markdown=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/blog/themes/default/post.html    | 31 +++++-----------------
 public/blog/themes/default/style.css    |  5 ++++
 public/blog/themes/default/theme.json   |  2 --
 public/blog/themes/elegant/post.html    | 34 ++++++-------------------
 public/blog/themes/elegant/style.css    |  4 ++-
 public/blog/themes/elegant/theme.json   |  4 +--
 public/blog/themes/nav_fixed/post.html  | 31 +++++-----------------
 public/blog/themes/nav_fixed/style.css  |  3 +++
 public/blog/themes/nav_fixed/theme.json |  4 +--
 9 files changed, 35 insertions(+), 83 deletions(-)

diff --git a/public/blog/themes/default/post.html b/public/blog/themes/default/post.html
index 861c116..e616363 100644
--- a/public/blog/themes/default/post.html
+++ b/public/blog/themes/default/post.html
@@ -108,34 +108,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 markdown 
 调用markdown来解析得到html
 -->
-
 {{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
+<script src="/public/libs/md2html/md2html.js"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
+md2Html(content, $("#content"), function(html) {
+    $("pre").addClass("prettyprint linenums");
+    prettyPrint();
+    initNav();
+    weixin();
+});
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>
diff --git a/public/blog/themes/default/style.css b/public/blog/themes/default/style.css
index 3416ae2..1d48b6c 100644
--- a/public/blog/themes/default/style.css
+++ b/public/blog/themes/default/style.css
@@ -530,3 +530,8 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+
+.desc *, #content * {
+    word-wrap: break-word;
+}
+
diff --git a/public/blog/themes/default/theme.json b/public/blog/themes/default/theme.json
index f3d9758..68e10c2 100644
--- a/public/blog/themes/default/theme.json
+++ b/public/blog/themes/default/theme.json
@@ -9,7 +9,6 @@
 
 请在此解析所有配置
 * Name 主题名
-* Desc 主题描述, 可以写一些安装或配置信息
 * Version 主题版本
 * Author 主题的作者
 * AuthorUrl 作者的博客链接或相关链接
@@ -19,7 +18,6 @@
 */
 {
     "Name": "Leanote default theme",
-    "Desc": "",
     "Version": "1.0",
     "Author": "leanote.com",
     "AuthorUrl": "http://leanote.com",
diff --git a/public/blog/themes/elegant/post.html b/public/blog/themes/elegant/post.html
index 861c116..a8d7a77 100644
--- a/public/blog/themes/elegant/post.html
+++ b/public/blog/themes/elegant/post.html
@@ -107,35 +107,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 <!-- 
 markdown 
 调用markdown来解析得到html
--->
-
-{{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
+-->{{if $.post.IsMarkdown }}
+<script src="/public/libs/md2html/md2html.js"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
+md2Html(content, $("#content"), function(html) {
+    $("pre").addClass("prettyprint linenums");
+    prettyPrint();
+    initNav();
+    weixin();
+});
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>
diff --git a/public/blog/themes/elegant/style.css b/public/blog/themes/elegant/style.css
index 164e808..f2a3fea 100644
--- a/public/blog/themes/elegant/style.css
+++ b/public/blog/themes/elegant/style.css
@@ -203,7 +203,6 @@ ul.dropdown-menu {
 }
 #footer {
   padding-bottom: 10px;
-  width: 700px;
 }
 .navbar-brand {
   display: none;
@@ -541,4 +540,7 @@ table tr:nth-child(2n) {
 	border: 1px solid #ddd;
 	border-collapse: collapse;
 	padding: 6px 13px;
+}
+.desc *, #content * {
+    word-wrap: break-word;
 }
\ No newline at end of file
diff --git a/public/blog/themes/elegant/theme.json b/public/blog/themes/elegant/theme.json
index 9797a7a..62004f9 100644
--- a/public/blog/themes/elegant/theme.json
+++ b/public/blog/themes/elegant/theme.json
@@ -9,17 +9,15 @@
 
 请在此解析所有配置
 * Name 主题名
-* Desc 主题描述, 可以写一些安装或配置信息
 * Version 主题版本
 * Author 主题的作者
 * AuthorUrl 作者的博客链接或相关链接
 
-* FriendLinks 友情链接 
+* FriendLinks 友情链接
 
 */
 {
     "Name": "Leanote elegant",
-    "Desc": "",
     "Version": "1.0",
     "Author": "leanote.com",
     "AuthorUrl": "http://leanote.com",
diff --git a/public/blog/themes/nav_fixed/post.html b/public/blog/themes/nav_fixed/post.html
index 861c116..e616363 100644
--- a/public/blog/themes/nav_fixed/post.html
+++ b/public/blog/themes/nav_fixed/post.html
@@ -108,34 +108,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 markdown 
 调用markdown来解析得到html
 -->
-
 {{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
+<script src="/public/libs/md2html/md2html.js"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
+md2Html(content, $("#content"), function(html) {
+    $("pre").addClass("prettyprint linenums");
+    prettyPrint();
+    initNav();
+    weixin();
+});
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>
diff --git a/public/blog/themes/nav_fixed/style.css b/public/blog/themes/nav_fixed/style.css
index 725f5dc..68abd7e 100644
--- a/public/blog/themes/nav_fixed/style.css
+++ b/public/blog/themes/nav_fixed/style.css
@@ -580,3 +580,6 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+.desc *, #content * {
+    word-wrap: break-word;
+}
diff --git a/public/blog/themes/nav_fixed/theme.json b/public/blog/themes/nav_fixed/theme.json
index 51472b4..6024ce3 100644
--- a/public/blog/themes/nav_fixed/theme.json
+++ b/public/blog/themes/nav_fixed/theme.json
@@ -9,17 +9,15 @@
 
 请在此解析所有配置
 * Name 主题名
-* Desc 主题描述, 可以写一些安装或配置信息
 * Version 主题版本
 * Author 主题的作者
 * AuthorUrl 作者的博客链接或相关链接
 
-* FriendLinks 友情链接 
+* FriendLinks 友情链接
 
 */
 {
     "Name": "Leanote nav fixed",
-    "Desc": "",
     "Version": "1.0",
     "Author": "leanote.com",
     "AuthorUrl": "http://leanote.com",