From f0ae1015f2508372632ca86c3904818139af3109 Mon Sep 17 00:00:00 2001
From: star7th <xing7th@gmail.com>
Date: Wed, 19 Oct 2016 21:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=94=9F=E6=88=90TOC?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E3=80=81=E7=A7=91=E5=AD=A6=E5=85=AC=E5=BC=8F?=
 =?UTF-8?q?=E3=80=81=E6=B5=81=E7=A8=8B=E5=9B=BE=E5=92=8C=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/Page/index.html | 10 ----------
 Public/js/page/edit.js                |  4 ++++
 Public/js/page/index.js               |  9 +++++++++
 composer.json                         |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Application/Home/View/Page/index.html b/Application/Home/View/Page/index.html
index 03be08b6f..fff4d7fcc 100644
--- a/Application/Home/View/Page/index.html
+++ b/Application/Home/View/Page/index.html
@@ -21,13 +21,3 @@ <h3 style="text-align: center;">{$page.page_title}</h3>
  <script src="__PUBLIC__/editor.md/lib/jquery.flowchart.min.js"></script>
  <script src="__PUBLIC__/editor.md/editormd.min.js"></script>
 <script src="__PUBLIC__/js/page/index.js"></script>
-<script type="text/javascript">
-	var EditormdView = editormd.markdownToHTML("page_md_content", {
-		htmlDecode      : "style,script,iframe",  // you can filter tags decode
-		emoji           : true,
-		taskList        : true,
-		tex             : true,  // 默认不解析
-		flowChart       : true,  // 默认不解析
-		sequenceDiagram : true,  // 默认不解析
-	});
-</script>
diff --git a/Public/js/page/edit.js b/Public/js/page/edit.js
index 7fbaea467..d30438781 100644
--- a/Public/js/page/edit.js
+++ b/Public/js/page/edit.js
@@ -110,6 +110,10 @@ $(function() {
     syncScrolling: "single",
     path: DocConfig.pubile + "/editor.md/lib/",
     placeholder: lang["editormd_placeholder"] ,
+    taskList        : true,
+    tex             : true,  // 默认不解析
+    flowChart       : true,  // 默认不解析
+    sequenceDiagram : true,  // 默认不解析
     imageUpload: true,
     imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
     imageUploadURL: "?s=home/page/uploadImg",
diff --git a/Public/js/page/index.js b/Public/js/page/index.js
index a1a883e79..e4e344fd4 100644
--- a/Public/js/page/index.js
+++ b/Public/js/page/index.js
@@ -1,6 +1,15 @@
 
 $(function(){
     hljs.initHighlightingOnLoad();
+    
+    var EditormdView = editormd.markdownToHTML("page_md_content", {
+      htmlDecode      : "style,script,iframe",  // you can filter tags decode
+      emoji           : true,
+      taskList        : true,
+      tex             : true,  // 默认不解析
+      flowChart       : true,  // 默认不解析
+      sequenceDiagram : true,  // 默认不解析
+    });
 
     //为所有table标签添加bootstap支持的表格类
     $("table").addClass("table table-bordered table-hover");
diff --git a/composer.json b/composer.json
index e38459788..106ca1030 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "description": "ShowDoc is a tool greatly applicable for an IT team to share documents online",
     "keywords": ["showdoc","documents","Api"],
     "homepage": "https://github.com/star7th/showdoc",
-    "version":"v1.1.0",
+    "version":"v1.1.1",
     "license": "Apache-2.0",
     "authors": [
         {