Merge pull request #27 from Coding/tencent

Tencent

Author: 春秋一语

app/commands/commandBindings/file.js

@@ -300,9 +300,7 @@ const fileCommands = {
     const { EditorTabState } = mobxStore
     const activeTab = EditorTabState.activeTab
     const isMonaco = !config.switchOldEditor
-
     const content = !activeTab ? '' : isMonaco ? activeTab.editorInfo.monacoEditor.getValue() : activeTab.editor.cm.getValue()
-
     if (!activeTab.file) {
       const createFile = createFileWithContent(content)
       const defaultPath = activeTab._title ? `/${activeTab._title}` : '/untitled'
@@ -465,7 +463,9 @@ const fileCommands = {
     } else {
       api.createFile(ignorePath, patchTxt)
       .then((res) => {
-        res.msg ? throw new Error(res.msg) : ''
+        if (res.msg) {
+          throw new Error(res.msg);
+        }
       })
       .then(() => api.writeFile(ignorePath, patchTxt))
       .then(() => {

app/components/Editor/state.js

@@ -201,6 +201,9 @@ class Editor {
     if (typeDetect(this.file.name, ['md', 'markdown', 'mdown'])) {
       return 'markdownEditor';
     }
+    if (typeDetect(this.file.name, ['html', 'htm'])) {
+      return 'htmlEditor'
+    }
     if (typeDetect(this.file.name, ['png', 'jpg', 'jpeg', 'gif', 'webp', 'ico', 'bmp'])) {
       return 'imageEditor';
     }

app/components/MonacoEditor/Editors/HtmlEditor.jsx

@@ -53,7 +53,6 @@ class HtmlEditor extends Component {
                 rightGrow: 50,
                 showBigSize: false,
                 showPreview: false,
-                collapseAuto: false,
                 previewUniqueId: '1',
                 isResizing: false,
             });

app/components/MonacoEditor/state.js

@@ -252,6 +252,9 @@ class EditorInfo {
     if (typeDetect(this.file.name, ['md', 'markdown', 'mdown'])) {
       return 'markdownEditor'
     }
+    if (typeDetect(this.file.name, ['html', 'htm'])) {
+      return 'htmlEditor'
+    }
     if (typeDetect(this.file.name, ['png', 'jpg', 'jpeg', 'gif', 'webp', 'ico', 'bmp'])) {
       return 'imageEditor'
     }