Home Explore Help
Register Sign In
chenxixian
/
HexoEditor
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Update UI
Fix Set Image Path invalid
Fix Auto compare file content

zhuzhuyule 7 years ago
parent
1b0a0d50e1
commit
0ffee144ed
8 changed files with 188 additions and 206 deletions
Unified View Show Diff Stats
  1. 1 1
      app/moe-window.js
  2. 2 1
      app/tool/hexo-shell.js
  3. 1 1
      package.json
  4. 170 169
      views/main/index.html
  5. 5 23
      views/main/moe-document.js
  6. 2 2
      views/main/moe-settings.js
  7. 2 2
      views/main/moe-sidemenu.js
  8. 5 7
      views/main/moe-style.css

+ 1 - 1
app/moe-window.js
View File 

@@ -28,7 +28,7 @@ const BrowserWindow = require('electron').BrowserWindow,
 
 class MoeditorWindow {
 
 class MoeditorWindow {
 
 	constructor(path,defName) {
 
 	constructor(path,defName) {
 
         moeApp.hexoWindow = this;
 
         moeApp.hexoWindow = this;
 
-        log.info('create window');
 
+        log.info ('new HexoEditor.');
 
         if (MoeditorFile.isDirectory(path)) {
 
         if (MoeditorFile.isDirectory(path)) {
 
             this.directory = path
 
             this.directory = path
 
             this.fileName = '';
 
             this.fileName = '';

+ 2 - 1
app/tool/hexo-shell.js
View File 

@@ -41,12 +41,12 @@ var shellServer = (function () {
 
         }
 
         }
 
 
 
         execCmd(command) {
 
         execCmd(command) {
 
-            log.info('execute', command);
 
             let flagOK = false;
 
             let flagOK = false;
 
             clearTimeout(_shellServer.timeID);
 
             clearTimeout(_shellServer.timeID);
 
             _shellServer.closeMsg = false;
 
             _shellServer.closeMsg = false;
 
             _shellServer.lastWindow = require('electron').BrowserWindow.getFocusedWindow();
 
             _shellServer.lastWindow = require('electron').BrowserWindow.getFocusedWindow();
 
             _shellServer.isForce = false;
 
             _shellServer.isForce = false;
 
+            log.info('Begin execute:', `[${moeApp.hexo.config.__basedir}] [${command}]`);
 
             _shellServer.shellProcess = exec(command, {cwd: moeApp.hexo.config.__basedir});
 
             _shellServer.shellProcess = exec(command, {cwd: moeApp.hexo.config.__basedir});
 
             _shellServer.sendConsole('<i class="fa fa-spinner fa-pulse fa-fw margin-bottom"></i>' + __("Executing"), 'info', 'ban');
 
             _shellServer.sendConsole('<i class="fa fa-spinner fa-pulse fa-fw margin-bottom"></i>' + __("Executing"), 'info', 'ban');
 
             _shellServer.shellProcess.stderr.on('data', (data) => {
 
             _shellServer.shellProcess.stderr.on('data', (data) => {
 
@@ -69,6 +69,7 @@ var shellServer = (function () {
 
                 }
 
                 }
 
             });
 
             });
 
             _shellServer.shellProcess.on('close', (code, signal) => {
 
             _shellServer.shellProcess.on('close', (code, signal) => {
 
+                log.info('End   execute:', `[${moeApp.hexo.config.__basedir}] [${command}]`);
 
                 if (flagOK === -1)
 
                 if (flagOK === -1)
 
                     _shellServer.sendConsole(__('Operation Execution Timeout'), 'danger', 'close');
 
                     _shellServer.sendConsole(__('Operation Execution Timeout'), 'danger', 'close');
 
                 else if (_shellServer.isForce)
 
                 else if (_shellServer.isForce)

+ 1 - 1
package.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
 {
 
   "name": "HexoEditor",
 
   "name": "HexoEditor",
 
-  "version": "1.3.21",
 
+  "version": "1.3.22",
 
   "description": "This is markdown editor for Hexo.",
 
   "description": "This is markdown editor for Hexo.",
 
   "main": "app/index.js",
 
   "main": "app/index.js",
 
   "scripts": {
 
   "scripts": {

+ 170 - 169
views/main/index.html
View File 

@@ -21,186 +21,186 @@
 
 -->
 
 -->
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
-    <head>
 
-        <meta charset="UTF-8">
 
-        <title>HexoEditor</title>
 
-        <base href="../href.html">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <title>HexoEditor</title>
 
+    <base href="../href.html">
 
 
 
-		<script>
 
-		window.$ = window.jQuery = require('jquery');
 
+    <script>
 
+        window.$ = window.jQuery = require('jquery');
 
         document.querySelector('html').classList.add(process.platform);
 
         document.querySelector('html').classList.add(process.platform);
 
-        </script>
 
-        <link rel="stylesheet" href="moe-scrollbar.css">
 
+    </script>
 
+    <link rel="stylesheet" href="moe-scrollbar.css">
 
 
 
-        <link rel="stylesheet" href="main/moe-treeview.css">
 
-        <link rel="stylesheet" href="fonts/moe-fonts.css">
 
-        <link rel="stylesheet" href="main/moe-style.css">
 
-        <link rel="stylesheet" href="main/base16-light.css">
 
-        <script type="text/javascript" src="main/moe-document.js"></script>
 
+    <link rel="stylesheet" href="main/moe-treeview.css">
 
+    <link rel="stylesheet" href="fonts/moe-fonts.css">
 
+    <link rel="stylesheet" href="main/moe-style.css">
 
+    <link rel="stylesheet" href="main/base16-light.css">
 
+    <script type="text/javascript" src="main/moe-document.js"></script>
 
 
 
-    </head>
 
-    <body>
 
-        <div id="electron-titlebar" class="inset" style="z-index: 1; ">
 
-            <div class="drag" id="drag-left"></div>
 
-            <div class="drag" id="drag-right"></div>
 
+</head>
 
+<body>
 
+<div id="electron-titlebar" class="inset" style="z-index: 1; ">
 
+    <div class="drag" id="drag-left"></div>
 
+    <div class="drag" id="drag-right"></div>
 
+</div>
 
+<!--<div id="indexPage" style="-->
 
+<!--z-index: 1;-->
 
+<!--width: 100%;-->
 
+<!--height: 100%;-->
 
+<!--position: fixed;-->
 
+<!--background: url(http://api.dujin.org/bing/1366.php);-->
 
+<!--background-size: 100%;-->
 
+<!--background-repeat: no-repeat;-->
 
+<!--">-->
 
+<!--</div>-->
 
+<div id="renameForm" class="renameForm">
 
+    <input id="rename-name" type="url" placeholder="sdfsdf">
 
+    <div class="button">
 
+        <button class="button button-check"><i class="fa fa-check" aria-hidden="true"></i></button>
 
+        <button class="button button-close"><i class="fa fa-close" aria-hidden="true"></i></button>
 
+    </div>
 
+</div>
 
+<div id="side-menu">
 
+    <div id="logo">HexoEditor</div>
 
+    <ul>
 
+        <li data-action="new" class="l10n" title="Ctrl+N">New</li>
 
+        <li data-action="newhexo" class="l10n" title="Ctrl+H">New Post</li>
 
+        <li data-action="open" class="l10n" title="Ctrl+O">Open</li>
 
+        <li data-action="save" class="l10n" title="Ctrl+S">Save</li>
 
+        <li data-action="save-as" class="l10n" title="Ctrl+Shift+S">Save as</li>
 
+        <li class="break"></li>
 
+        <li data-action="export-as-html" class="l10n">Export as HTML</li>
 
+        <li data-action="export-as-pdf" class="l10n">Export as PDF</li>
 
+        <li class="break"></li>
 
+        <li data-action="settings" class="l10n">Settings</li>
 
+        <li data-action="about" class="l10n">About</li>
 
+    </ul>
 
+</div>
 
+<div id="file-tree" class="tree-view">
 
+    <div class="tree-view-item tree-view-item-template">
 
+        <div class="tree-view-thisitem">
 
+            <div class="tree-view-caret">
 
+                <i class="tree-view-caret-right fa fa-caret-right" aria-hidden="true"></i>
 
+                <i class="tree-view-caret-down fa fa-caret-down" aria-hidden="true"></i>
 
+            </div>
 
+            <div class="tree-view-icon">
 
+                <i class="tree-view-icon-dir fa fa-folder-o" aria-hidden="true"></i>
 
+                <i class="tree-view-icon-file fa fa-file-o" aria-hidden="true"></i>
 
+            </div>
 
+            <div class="tree-view-text">
 
+            </div>
 
+        </div>
 
+        <div class="tree-view-subitems">
 
         </div>
 
         </div>
 
-        <!--<div id="indexPage" style="-->
 
-                    <!--z-index: 1;-->
 
-                    <!--width: 100%;-->
 
-                    <!--height: 100%;-->
 
-                    <!--position: fixed;-->
 
-                    <!--background: url(http://api.dujin.org/bing/1366.php);-->
 
-                    <!--background-size: 100%;-->
 
-                    <!--background-repeat: no-repeat;-->
 
-        <!--">-->
 
-        <!--</div>-->
 
-        <div id="renameForm" class="renameForm">
 
-            <input id="rename-name" type="url" placeholder="sdfsdf">
 
-            <div class="button">
 
-                <button class="button button-check" ><i class="fa fa-check" aria-hidden="true"></i></button>
 
-                <button class="button button-close" ><i class="fa fa-close" aria-hidden="true"></i></button>
 
+    </div>
 
+    <div class="tree-view-items">
 
+    </div>
 
+</div>
 
+<div id="main" class="notransition">
 
+    <div id="side-menu-cover"></div>
 
+    <div id="file-tree-cover"></div>
 
+    <div id="main-container">
 
+        <div id="left-panel">
 
+            <div id="editor">
 
+                <textarea></textarea>
 
             </div>
 
             </div>
 
+            <div class="cover-top"></div>
 
         </div>
 
         </div>
 
-        <div id="side-menu">
 
-            <div id="logo">HexoEditor</div>
 
-            <ul>
 
-                <li data-action="new" class="l10n" title="Ctrl+N">New</li>
 
-                <li data-action="newhexo" class="l10n" title="Ctrl+H">New Post</li>
 
-                <li data-action="open" class="l10n" title="Ctrl+O">Open</li>
 
-                <li data-action="save" class="l10n" title="Ctrl+S">Save</li>
 
-                <li data-action="save-as" class="l10n" title="Ctrl+Shift+S">Save as</li>
 
-                <li class="break"></li>
 
-                <li data-action="export-as-html" class="l10n">Export as HTML</li>
 
-                <li data-action="export-as-pdf" class="l10n">Export as PDF</li>
 
-                <li class="break"></li>
 
-                <li data-action="settings" class="l10n">Settings</li>
 
-                <li data-action="about" class="l10n">About</li>
 
-            </ul>
 
+
 
+        <div id="right-panel">
 
+            <div class="CodeMirror-vscrollbar" cm-not-content="true" style="display: block; ">
 
+                <div style="min-width: 1px;"></div>
 
+            </div>
 
+            <div id="preview" tabindex="-1">
 
+                <div id="container" class="preview post-body"></div>
 
+            </div>
 
+            <div class="cover-top"></div>
 
         </div>
 
         </div>
 
-        <div id="file-tree" class="tree-view">
 
-            <div class="tree-view-item tree-view-item-template">
 
-                <div class="tree-view-thisitem">
 
-                    <div class="tree-view-caret">
 
-                        <i class="tree-view-caret-right fa fa-caret-right" aria-hidden="true"></i>
 
-                        <i class="tree-view-caret-down fa fa-caret-down" aria-hidden="true"></i>
 
-                    </div>
 
-                    <div class="tree-view-icon">
 
-                        <i class="tree-view-icon-dir fa fa-folder-o" aria-hidden="true"></i>
 
-                        <i class="tree-view-icon-file fa fa-file-o" aria-hidden="true"></i>
 
-                    </div>
 
-                    <div class="tree-view-text">
 
-                    </div>
 
-                </div>
 
-                <div class="tree-view-subitems">
 
+    </div>
 
+    <div id="cover-bottom">
 
+        <div id="cover-bottom-background-left"></div>
 
+        <div id="cover-bottom-background-right"></div>
 
+        <div id="cover-bottom-tools">
 
+            <div id="cover-bottom-left">
 
+                <div class="button-bottom l10n-title" id="button-bottom-menu" title="Menu">
 
+                    <i class="fa fa-bars" aria-hidden="true"></i>
 
                 </div>
 
                 </div>
 
+                <!--<div class="button-bottom l10n-title"  title="Refresh" onclick="location.reload(true)">-->
 
+                <!--<i class="fa fa-refresh" aria-hidden="true"></i>-->
 
+                <!--</div>-->
 
+                <!--<div class="button-bottom l10n-title" id="button-bottom-file-tree" title="Directory">-->
 
+                <!--<i class="fa fa-folder-o" aria-hidden="true"></i>-->
 
+                <!--</div>-->
 
             </div>
 
             </div>
 
-            <div class="tree-view-items">
 
+            <div id="cover-bottom-status">
 
+                <div class="status-button"></div>
 
+                <div id="status-content" class="transition"></div>
 
             </div>
 
             </div>
 
-        </div>
 
-        <div id="main" class="notransition">
 
-            <div id="side-menu-cover"></div>
 
-            <div id="file-tree-cover"></div>
 
-            <div id="main-container">
 
-                <div id="left-panel">
 
-                    <div id="editor">
 
-                        <textarea></textarea>
 
-                    </div>
 
-                    <div class="cover-top"></div>
 
+            <div id="cover-bottom-right">
 
+                <div class="button-bottom l10n-title" id="button-bottom-focus" title="Toggle focus mode">
 
+                    <i class="fa fa-dot-circle-o" aria-hidden="true"></i>
 
                 </div>
 
                 </div>
 
 
 
-                <div id="right-panel">
 
-                    <div class="CodeMirror-vscrollbar" cm-not-content="true" style="display: block; ">
 
-                        <div style="min-width: 1px;"></div>
 
-                    </div>
 
-                    <div id="preview" tabindex="-1">
 
-                        <div id="container" class="preview post-body"></div>
 
-                    </div>
 
-                    <div class="cover-top"></div>
 
+                <div class="button-bottom l10n-title" title="Write Mode" exdata="(Ctrl+W)" mode-button="write">
 
+                    <i class="fa fa-pencil" aria-hidden="true"></i>
 
                 </div>
 
                 </div>
 
-            </div>
 
-            <div id="cover-bottom">
 
-                <div id="cover-bottom-background-left"></div>
 
-                <div id="cover-bottom-background-right"></div>
 
-                <div id="cover-bottom-tools">
 
-                    <div id="cover-bottom-left">
 
-                        <div class="button-bottom l10n-title" id="button-bottom-menu" title="Menu">
 
-                            <i class="fa fa-bars" aria-hidden="true"></i>
 
-                        </div>
 
-                        <!--<div class="button-bottom l10n-title"  title="Refresh" onclick="location.reload(true)">-->
 
-                        <!--<i class="fa fa-refresh" aria-hidden="true"></i>-->
 
-                        <!--</div>-->
 
-                        <!--<div class="button-bottom l10n-title" id="button-bottom-file-tree" title="Directory">-->
 
-                        <!--<i class="fa fa-folder-o" aria-hidden="true"></i>-->
 
-                        <!--</div>-->
 
-                    </div>
 
-                    <div id="cover-bottom-status">
 
-                        <div class="status-button"></div>
 
-                        <div id="status-content" class="transition"></div>
 
-                    </div>
 
-                    <div id="cover-bottom-right">
 
-                        <div class="button-bottom l10n-title" id="button-bottom-focus" title="Toggle focus mode">
 
-                            <i class="fa fa-dot-circle-o" aria-hidden="true"></i>
 
-                        </div>
 
-
 
-                        <div class="button-bottom l10n-title"  title="Write Mode" exdata="(Ctrl+W)" mode-button="write">
 
-                            <i class="fa fa-pencil" aria-hidden="true"></i>
 
-                        </div>
 
-                        <div class="button-bottom l10n-title"  title="Preview Mode" exdata="(Ctrl+P)" mode-button="preview">
 
-                            <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
 
-                        </div>
 
-                        <div class="button-bottom l10n-title"  title="Read Mode" exdata="(Ctrl+R)" mode-button="read">
 
-                            <i class="fa fa-eye" aria-hidden="true"></i>
 
-                        </div>
 
-                    </div>
 
+                <div class="button-bottom l10n-title" title="Preview Mode" exdata="(Ctrl+P)" mode-button="preview">
 
+                    <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
 
+                </div>
 
+                <div class="button-bottom l10n-title" title="Read Mode" exdata="(Ctrl+R)" mode-button="read">
 
+                    <i class="fa fa-eye" aria-hidden="true"></i>
 
                 </div>
 
                 </div>
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
+    </div>
 
+</div>
 
 
 
-        <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css">
 
-        <link rel="stylesheet" href="../node_modules/codemirror/lib/codemirror.css">
 
-        <link rel="stylesheet" href="../node_modules/katex/dist/katex.min.css">
 
-        <link rel="stylesheet" href="../node_modules/biu.js/dist/biu.css">
 
+<link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css">
 
+<link rel="stylesheet" href="../node_modules/codemirror/lib/codemirror.css">
 
+<link rel="stylesheet" href="../node_modules/katex/dist/katex.min.css">
 
+<link rel="stylesheet" href="../node_modules/biu.js/dist/biu.css">
 
 
 
-        <script src="../node_modules/codemirror/lib/codemirror.js"></script>
 
-        <!--Mode-->
 
-        <script src="../node_modules/codemirror/addon/mode/simple.js"></script>
 
-        <script src="../node_modules/codemirror/mode/markdown/markdown.js"></script>
 
-        <script src="../node_modules/codemirror/mode/yaml/yaml.js"></script>
 
-        <script src="../node_modules/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js"></script>
 
-        <script src="../node_modules/codemirror/mode/gfm/gfm.js"></script>
 
-        <script src="../node_modules/codemirror/mode/xml/xml.js"></script>
 
-        <script src="../node_modules/codemirror/mode/css/css.js"></script>
 
-        <script src="../node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
 
-        <script src="../node_modules/codemirror/mode/javascript/javascript.js"></script>
 
-        <script src="../node_modules/codemirror/mode/javascript/javascript.js"></script>
 
-        <script src="../node_modules/codemirror/mode/clike/clike.js"></script>
 
-        <script src="../node_modules/codemirror/mode/sql/sql.js"></script>
 
-        <script src="../node_modules/codemirror/mode/python/python.js"></script>
 
-        <script src="../node_modules/codemirror/mode/php/php.js"></script>
 
-        <!--hint-->
 
-        <!--<script src="../node_modules/codemirror/addon/hint/anyword-hint.js"></script>-->
 
-        <!--<script src="../node_modules/codemirror/addon/hint/javascript-hint.js"></script>-->
 
-        <!--<script src="../node_modules/codemirror/addon/hint/sql-hint.js"></script>-->
 
-        <!--<script src="../node_modules/codemirror/addon/hint/show-hint.js"></script>-->
 
-        <!--brackets-->
 
-        <script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
 
-        <!--fold-->
 
-        <script src="../node_modules/codemirror/addon/fold/foldcode.js"></script>
 
-        <script src="../node_modules/codemirror/addon/fold/foldgutter.js"></script>
 
-        <script src="../node_modules/codemirror/addon/fold/brace-fold.js"></script>
 
-        <script src="../node_modules/codemirror/addon/fold/comment-fold.js"></script>
 
-        <!--other-->
 
-        <script src="../node_modules/codemirror/addon/mode/overlay.js"></script>
 
-        <script src="../node_modules/codemirror/addon/mode/multiplex.js"></script>
 
-        <script src="../node_modules/codemirror/addon/scroll/simplescrollbars.js"></script>
 
-        <script src="../node_modules/codemirror/addon/selection/active-line.js"></script>
 
-        <script src="main/CodeMirror/continuelist.js"></script>
 
+<script src="../node_modules/codemirror/lib/codemirror.js"></script>
 
+<!--Mode-->
 
+<script src="../node_modules/codemirror/addon/mode/simple.js"></script>
 
+<script src="../node_modules/codemirror/mode/markdown/markdown.js"></script>
 
+<script src="../node_modules/codemirror/mode/yaml/yaml.js"></script>
 
+<script src="../node_modules/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js"></script>
 
+<script src="../node_modules/codemirror/mode/gfm/gfm.js"></script>
 
+<script src="../node_modules/codemirror/mode/xml/xml.js"></script>
 
+<script src="../node_modules/codemirror/mode/css/css.js"></script>
 
+<script src="../node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
 
+<script src="../node_modules/codemirror/mode/javascript/javascript.js"></script>
 
+<script src="../node_modules/codemirror/mode/javascript/javascript.js"></script>
 
+<script src="../node_modules/codemirror/mode/clike/clike.js"></script>
 
+<script src="../node_modules/codemirror/mode/sql/sql.js"></script>
 
+<script src="../node_modules/codemirror/mode/python/python.js"></script>
 
+<script src="../node_modules/codemirror/mode/php/php.js"></script>
 
+<!--hint-->
 
+<!--<script src="../node_modules/codemirror/addon/hint/anyword-hint.js"></script>-->
 
+<!--<script src="../node_modules/codemirror/addon/hint/javascript-hint.js"></script>-->
 
+<!--<script src="../node_modules/codemirror/addon/hint/sql-hint.js"></script>-->
 
+<!--<script src="../node_modules/codemirror/addon/hint/show-hint.js"></script>-->
 
+<!--brackets-->
 
+<script src="../node_modules/codemirror/addon/edit/closebrackets.js"></script>
 
+<!--fold-->
 
+<script src="../node_modules/codemirror/addon/fold/foldcode.js"></script>
 
+<script src="../node_modules/codemirror/addon/fold/foldgutter.js"></script>
 
+<script src="../node_modules/codemirror/addon/fold/brace-fold.js"></script>
 
+<script src="../node_modules/codemirror/addon/fold/comment-fold.js"></script>
 
+<!--other-->
 
+<script src="../node_modules/codemirror/addon/mode/overlay.js"></script>
 
+<script src="../node_modules/codemirror/addon/mode/multiplex.js"></script>
 
+<script src="../node_modules/codemirror/addon/scroll/simplescrollbars.js"></script>
 
+<script src="../node_modules/codemirror/addon/selection/active-line.js"></script>
 
+<script src="main/CodeMirror/continuelist.js"></script>
 
 
 
-        <script src="../node_modules/katex/dist/katex.min.js"></script>
 
-        <script src="../node_modules/biu.js/dist/biu.min.js"></script>
 
-        <!-- Mathjax config -->
 
-        <script src="../node_modules/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 
-        <script type="text/x-mathjax-config">
 
+<script src="../node_modules/katex/dist/katex.min.js"></script>
 
+<script src="../node_modules/biu.js/dist/biu.min.js"></script>
 
+<!-- Mathjax config -->
 
+<script src="../node_modules/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 
+<script type="text/x-mathjax-config">
 
             MathJax.Hub.Config({
 
             MathJax.Hub.Config({
 
                 tex2jax: {
 
                 tex2jax: {
 
                     preview: "none",
 
                     preview: "none",
 
@@ -209,15 +209,16 @@
 
                 },
 
                 },
 
                 messageStyle: "none"
 
                 messageStyle: "none"
 
             });
 
             });
 
-        </script>
 
 
 
-        <script type="text/javascript" src="main/moe-sidemenu.js"></script>
 
-        <!--<script type="text/javascript" src="main/moe-treeview.js"></script>-->
 
-        <script type="text/javascript" src="main/moe-mode.js"></script>
 
-        <script type="text/javascript" src="main/moe-export.js"></script>
 
-        <script type="text/javascript" src="main/moe-popmessage.js"></script>
 
-        <script type="text/javascript" src="main/moe-contextmenu.js"></script>
 
+</script>
 
+
 
+<script type="text/javascript" src="main/moe-sidemenu.js"></script>
 
+<!--<script type="text/javascript" src="main/moe-treeview.js"></script>-->
 
+<script type="text/javascript" src="main/moe-mode.js"></script>
 
+<script type="text/javascript" src="main/moe-export.js"></script>
 
+<script type="text/javascript" src="main/moe-popmessage.js"></script>
 
+<script type="text/javascript" src="main/moe-contextmenu.js"></script>
 
 
 
-        <script type="text/javascript" src="moe-localize.js"></script>
 
-    </body>
 
+<script type="text/javascript" src="moe-localize.js"></script>
 
+</body>
 
 </html>
 
 </html>

+ 5 - 23
views/main/moe-document.js
View File 

@@ -278,17 +278,8 @@ $(() => {
 
                 }
 
                 }
 
             }
 
             }
 
             if (force) {
 
             if (force) {
 
-                fs.writeFile(hexoWindow.fileName, hexoWindow.content, (err) => {
 
-                    if (err) {
 
-                        hexoWindow.window.setDocumentEdited(true);
 
-                        return;
 
-                    }
 
-                    hexoWindow.isSaved = true;
 
-                    hexoWindow.changed = false;
 
-                    hexoWindow.window.setDocumentEdited(false);
 
-                    hexoWindow.fileContent = hexoWindow.content;
 
-                    app.addRecentDocument(nameNew);
 
-                });
 
+                const MoeditorAction = require('electron').remote.require('./moe-action');
 
+                MoeditorAction.save(hexoWindow.window);
 
             }
 
             }
 
         } catch (e) {
 
         } catch (e) {
 
             console.log(e);
 
             console.log(e);
 
@@ -298,17 +289,8 @@ $(() => {
 
     window.autoSave = () => {
 
     window.autoSave = () => {
 
         const option = moeApp.config.get('auto-save');
 
         const option = moeApp.config.get('auto-save');
 
         if (option === 'auto' && hexoWindow.content !== hexoWindow.fileContent) {
 
         if (option === 'auto' && hexoWindow.content !== hexoWindow.fileContent) {
 
-            fs.writeFile(hexoWindow.fileName, hexoWindow.content, (err) => {
 
-                if (err) {
 
-                    hexoWindow.changed = true;
 
-                    hexoWindow.window.setDocumentEdited(true);
 
-                    return;
 
-                }
 
-                hexoWindow.isSaved = true;
 
-                hexoWindow.changed = false;
 
-                hexoWindow.fileContent = hexoWindow.content;
 
-                hexoWindow.window.setDocumentEdited(false);
 
-            });
 
+            const MoeditorAction = require('electron').remote.require('./moe-action');
 
+            MoeditorAction.save(hexoWindow.window);
 
         }
 
         }
 
     }
 
     }
 
 
 
@@ -442,7 +424,7 @@ $(() => {
 
     window.onfocus = (e) => {
 
     window.onfocus = (e) => {
 
         if (hexoWindow.fileName === '' || !fs.existsSync(hexoWindow.fileName))
 
         if (hexoWindow.fileName === '' || !fs.existsSync(hexoWindow.fileName))
 
             return;
 
             return;
 
-        fs.readFile(hexoWindow.fileName, (err, res) => {
 
+        fs.readFile(hexoWindow.fileName,"utf8", (err, res) => {
 
             if (err) {
 
             if (err) {
 
                 hexoWindow.changed = true;
 
                 hexoWindow.changed = true;
 
                 hexoWindow.window.setDocumentEdited(true);
 
                 hexoWindow.window.setDocumentEdited(true);

+ 2 - 2
views/main/moe-settings.js
View File 

@@ -156,14 +156,14 @@ function setHexoAutoSetting(val) {
 
 
 
 function setHexoConfigEnable(val) {
 
 function setHexoConfigEnable(val) {
 
     moeApp.useHexo = val;
 
     moeApp.useHexo = val;
 
-    imgManager.updateBase();
 
     hexo.changeConfig();
 
     hexo.changeConfig();
 
+    imgManager.updateBase();
 
     window.updatePreview(true);
 
     window.updatePreview(true);
 
 };
 
 };
 
 
 
 function setHexoConfig(val) {
 
 function setHexoConfig(val) {
 
-    imgManager.updateBase();
 
     hexo.changeConfig();
 
     hexo.changeConfig();
 
+    imgManager.updateBase();
 
     window.updatePreview(true);
 
     window.updatePreview(true);
 
 };
 
 };

+ 2 - 2
views/main/moe-sidemenu.js
View File 

@@ -19,9 +19,9 @@
 
 
 
 'use strict';
 
 'use strict';
 
 
 
-const MoeditorAction = require('electron').remote.require('./moe-action');
 
 
 
 document.addEventListener('DOMContentLoaded', () => {
 
 document.addEventListener('DOMContentLoaded', () => {
 
+    const MoeditorAction = require('electron').remote.require('./moe-action');
 
     const sideMenuButton = document.getElementById('button-bottom-menu');
 
     const sideMenuButton = document.getElementById('button-bottom-menu');
 
     const sideMenu = document.getElementById('side-menu');
 
     const sideMenu = document.getElementById('side-menu');
 
     const sideMenuCover = document.getElementById('side-menu-cover');
 
     const sideMenuCover = document.getElementById('side-menu-cover');
 
@@ -38,7 +38,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
     }
 
     }
 
 
 
     function hideMenu() {
 
     function hideMenu() {
 
-        sideMenu.style.marginLeft = '-300px';
 
+        sideMenu.style.marginLeft =  -document.getElementById('side-menu').offsetWidth + 'px';
 
         document.getElementById('main').classList.remove('notransition');
 
         document.getElementById('main').classList.remove('notransition');
 
         sideMenuCover.style.opacity = '0';
 
         sideMenuCover.style.opacity = '0';
 
         sideMenuCover.style.pointerEvents = 'none';
 
         sideMenuCover.style.pointerEvents = 'none';

+ 5 - 7
views/main/moe-style.css
View File 

@@ -55,7 +55,7 @@ body{
 
 }
 
 }
 
 
 
 #side-menu {
 
 #side-menu {
 
-    width: 300px;
 
+    width: 299px;
 
     margin-left: -300px;
 
     margin-left: -300px;
 
     height: 100%;
 
     height: 100%;
 
     background: #fafafa;
 
     background: #fafafa;
 
@@ -239,11 +239,11 @@ body{
 
 }
 
 }
 
 
 
 #left-panel .cover-top {
 
 #left-panel .cover-top {
 
-    left: 0;
 
+    left: 1px !important;
 
 }
 
 }
 
 
 
 #right-panel .cover-top {
 
 #right-panel .cover-top {
 
-    right: 0;
 
+    right: -1px !important;;
 
 }
 
 }
 
 
 
 .cover-nobackground {
 
 .cover-nobackground {
 
@@ -507,17 +507,15 @@ body[settings-mode=read] #drag-right, body[settings-mode=write] #drag-right {
 
 }
 
 }
 
 
 
 .biu-instance {
 
 .biu-instance {
 
-    line-height: 2;
 
     -webkit-app-region: no-drag;
 
     -webkit-app-region: no-drag;
 
     font-size: 14px;
 
     font-size: 14px;
 
     font-family: Roboto, Helvetica, 'Segoe UI', Arial, sans-serif;
 
     font-family: Roboto, Helvetica, 'Segoe UI', Arial, sans-serif;
 
+    line-height: 1.4 !important;
 
+    padding: 5px 0px 4px 0!important;
 
 }
 
 }
 
 
 
 .biu-instance.biu-webConsole{
 
 .biu-instance.biu-webConsole{
 
     -webkit-app-region: drag;
 
     -webkit-app-region: drag;
 
-    padding: 0;
 
-    top: 1px;
 
-    box-shadow: none;
 
 }
 
 }
 
 
 
 .biu-close{
 
 .biu-close{