fix bugs

scopier · Feb 19, 2015 · bae1b99 · bae1b99
1 parent b0bd906
commit bae1b99
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 22 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -128,5 +128,8 @@
 
 #####v1.1.1
 
-接受一个pull请求，修复了`getHTML ()`和`getPreviewedHTML()`方法中的３处错误；
+- 接受一个pull请求，修复了`getHTML ()`和`getPreviewedHTML()`方法中的３处错误；
 
+#####v1.1.2
+
+- 修复Bug[＃10](https://github.com/pandao/editor.md/issues/10)； 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "editor.md",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "homepage": "https://github.com/pandao/editor.md",
   "authors": [
     "Pandao <[email protected]>"

diff --git a/dist/js/editormd.js b/dist/js/editormd.js
@@ -1,7 +1,7 @@
 /*
  * Editor.md
  * @file        editormd.js 
- * @version     v1.1.1 
+ * @version     v1.1.2 
  * @description A simple online markdown editor.
  * @license     MIT License
  * @author      Pandao
@@ -12,7 +12,7 @@
 /** 
  * @fileOverview Editor.md
  * @author pandao
- * @version 1.1.0 
+ * @version 1.1.2 
  */
 
 ;(function(factory) {
@@ -55,7 +55,7 @@
     };
 
     editormd.title       = editormd.$name = "Editor.md";
-    editormd.version     = "1.1.0";
+    editormd.version     = "1.1.2";
     editormd.homePage    = "https://pandao.github.io/editor.md/";
     editormd.classPrefix = "editormd-";  
 
@@ -2159,9 +2159,9 @@
 
             if (settings.toolbar) {
                 toolbar.toggle();
+                toolbar.find(".fa[name=preview]").toggleClass("active");
             }
-
-            toolbar.find(".fa[name=preview]").toggleClass("active");
+
             codeMirror.toggle();
 
             if(codeMirror.css("display") === "none") // 为了兼容Zepto，而不使用codeMirror.is(":hidden")
@@ -2175,6 +2175,22 @@
                 editor.find("." + this.classPrefix + "preview-close-btn").show().bind(editormd.mouseOrTouch("click", "touchend"), function(){
                     _this.previewed();
                 });
+
+                if(!settings.watch)
+                {
+                    var codeEditor       = this.codeEditor;
+                    var previewContainer = this.previewContainer;
+
+                    codeEditor.save();
+
+                    var markdownToC      = this.markdownToC   = [];
+                    var newMarkdownDoc   = editormd.$marked(codeEditor.getValue(), {renderer : editormd.markedRenderer(markdownToC)});
+                    previewContainer.html(newMarkdownDoc);
+
+                    if (settings.toc) {
+                        editormd.markdownToCRenderer(markdownToC, previewContainer, settings.tocStartLevel);
+                    }
+                }
 
                 preview.show().css({
                     top       : 0,

diff --git a/dist/js/editormd.min.js b/dist/js/editormd.min.js
diff --git a/dist/js/languages/en.js b/dist/js/languages/en.js
@@ -1,7 +1,7 @@
 /*
  * Editor.md
  * @file        languages/en.js 
- * @version     v1.1.1 
+ * @version     v1.1.2 
  * @description A simple online markdown editor.
  * @license     MIT License
  * @author      Pandao

diff --git a/dist/js/languages/en.min.js b/dist/js/languages/en.min.js
diff --git a/dist/js/languages/zh-tw.js b/dist/js/languages/zh-tw.js
@@ -1,7 +1,7 @@
 /*
  * Editor.md
  * @file        languages/zh-tw.js 
- * @version     v1.1.1 
+ * @version     v1.1.2 
  * @description A simple online markdown editor.
  * @license     MIT License
  * @author      Pandao

diff --git a/dist/js/languages/zh-tw.min.js b/dist/js/languages/zh-tw.min.js
diff --git a/examples/simple.html b/examples/simple.html
@@ -9,9 +9,9 @@
     <body>
         <div id="layout">
             <header>
-                <h1>简单示例</h1>  
+                <h1>简单示例</h1>
             </header>
-            <div id="test-editormd">                
+            <div id="test-editormd">
                 <textarea style="display:none;">###Hello world!
 
 本示例未开启：
@@ -23,7 +23,7 @@ <h1>简单示例</h1>
             </div>
         </div>
         <script src="../lib/jquery.min.js"></script>
-        <script src="../src/js/editormd.js"></script>   
+        <script src="../src/js/editormd.js"></script>
         <script type="text/javascript">
 			var testEditor;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "editor.md",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A simple online markdown editor.",
   "directories": {
     "doc": "docs",

diff --git a/src/js/editormd.js b/src/js/editormd.js
@@ -1,7 +1,7 @@
 /** 
  * @fileOverview Editor.md
  * @author pandao
- * @version 1.1.0 
+ * @version 1.1.2 
  */
 
 ;(function(factory) {
@@ -44,7 +44,7 @@
     };
 
     editormd.title       = editormd.$name = "Editor.md";
-    editormd.version     = "1.1.0";
+    editormd.version     = "1.1.2";
     editormd.homePage    = "https://pandao.github.io/editor.md/";
     editormd.classPrefix = "editormd-";  
 
@@ -2148,9 +2148,9 @@
 
             if (settings.toolbar) {
                 toolbar.toggle();
+                toolbar.find(".fa[name=preview]").toggleClass("active");
             }
-
-            toolbar.find(".fa[name=preview]").toggleClass("active");
+
             codeMirror.toggle();
 
             if(codeMirror.css("display") === "none") // 为了兼容Zepto，而不使用codeMirror.is(":hidden")
@@ -2164,6 +2164,22 @@
                 editor.find("." + this.classPrefix + "preview-close-btn").show().bind(editormd.mouseOrTouch("click", "touchend"), function(){
                     _this.previewed();
                 });
+
+                if(!settings.watch)
+                {
+                    var codeEditor       = this.codeEditor;
+                    var previewContainer = this.previewContainer;
+
+                    codeEditor.save();
+
+                    var markdownToC      = this.markdownToC   = [];
+                    var newMarkdownDoc   = editormd.$marked(codeEditor.getValue(), {renderer : editormd.markedRenderer(markdownToC)});
+                    previewContainer.html(newMarkdownDoc);
+
+                    if (settings.toc) {
+                        editormd.markdownToCRenderer(markdownToC, previewContainer, settings.tocStartLevel);
+                    }
+                }
 
                 preview.show().css({
                     top       : 0,