Merge pull request #18 from Coding/tencent

Tencent

Author: 春秋一语

app/commands/commandBindings/editor.js

@@ -22,4 +22,3 @@ export default {
     Pane.split(4, 'row')
   }
 }
-

app/commands/keymaps.js

@@ -22,7 +22,7 @@ if (isMac) {
     'cmd+alt+4': 'editor:split_pane_vertical_4',
     'cmd+,': 'global:show_settings',
     'ctrl+g': 'editor:goto',
-    'alt+l': 'edit:toggle_format',
+    'alt+l': 'edit:toggle_format_monaco',
     'cmd+/': 'edit:toggle_comment',
     'cmd+f11': 'tab:zenmode',
   }
@@ -50,7 +50,7 @@ if (isMac) {
     'ctrl+alt+4': 'editor:split_pane_vertical_4',
     'alt+,': 'global:show_settings',
     'ctrl+g': 'editor:goto',
-    'alt+l': 'edit:toggle_format',
+    'alt+l': 'edit:toggle_format_monaco',
     'ctrl+/': 'edit:toggle_comment',
     'ctrl+f11': 'tab:zenmode',
   }

app/components/Editor/components/MarkdownEditor/index.jsx

@@ -3,7 +3,6 @@ import PropTypes from 'prop-types'
 import { autorun, extendObservable, observable, autorunAsync } from 'mobx'
 import debounce from 'lodash/debounce'
 import cx from 'classnames'
-import marked from 'marked'
 import Remarkable from 'remarkable'
 import { observer } from 'mobx-react'
 import CodeEditor from '../CodeEditor'
@@ -69,13 +68,6 @@ md.renderer.rules.heading_open = (tokens, idx) => {
   return '<h' + tokens[idx].hLevel + '>'
 }
 
-marked.setOptions({
-  highlight: (code) => {
-    require('highlight.js/styles/github-gist.css')
-    return require('highlight.js').highlightAuto(code).value
-  },
-})
-
 @observer
 class PreviewEditor extends Component {
   constructor (props) {
@@ -142,7 +134,7 @@ class MarkdownEditor extends Component {
         showPreview: true,
       })
     }
-    
+
     this.state = observable({
       previewContent: '',
       tokens: []

app/components/Editor/components/MarkdownEditor/mdMixin.js

@@ -1,7 +1,6 @@
 import state from './state'
 // import findByTextContent from './utils'
 import debounce from 'lodash/debounce'
-import marked from 'marked'
 import animatedScrollTo from 'animated-scrollto'
 
 const buildScrollMap = (previewDOM) => {

app/components/Git/actions.js

@@ -23,6 +23,10 @@ export function commit () {
       files: stagedFilesPathList,
       message: GitState.commitMessage || initialCommitMessage,
     }).then((filetreeDelta) => {
+      if (filetreeDelta.code) {
+        notify({ notifyType: NOTIFY_TYPE.ERROR, message: filetreeDelta.msg });
+        return;
+      }
       dispatch(updateCommitMessage(''))
       notify({ message: i18n`git.action.commitSuccess` })
       dismissModal()

app/components/Setting/KeymapSetting.jsx

@@ -1,8 +1,31 @@
-import React, { Component } from 'react'
+import React from 'react'
 import { observer } from 'mobx-react'
 import i18n from 'utils/createI18n'
 import FormInputGroup from './FormInputGroup'
 
+const keymaps = [
+  { id: 0, cmd: i18n`settings.keymap.createFile`, mac: ['alt', 'n'], win: ['alt', 'n'] },
+  { id: 1, cmd: i18n`settings.keymap.createFolder`, mac: ['alt', 'shift', 'n'], win: ['alt', 'shift', 'n'] },
+  { id: 2, cmd: i18n`settings.keymap.saveFile`, mac: ['cmd', 's'], win: ['ctrl', 's'] },
+  { id: 3, cmd: i18n`settings.keymap.gitCommit`, mac: ['cmd', 'ctrl', 'c'], win: ['ctrl', 'alt', 'c'] },
+  { id: 4, cmd: i18n`settings.keymap.exitModal`, mac: ['esc'], win: ['esc'] },
+  { id: 5, cmd: i18n`settings.keymap.commandPalette`, mac: ['cmd', 'shift', 'p'], win: ['ctrl', 'shift', 'p'] },
+  { id: 6, cmd: i18n`settings.keymap.filePalette`, mac: ['cmd', 'p'], win: ['ctrl', 'p'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', '1'], win: ['ctrl', 'alt', '1'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', 'shift', '1'], win: ['ctrl', 'alt', 'shift', '1'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', '2'], win: ['ctrl', 'alt', '2'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', 'shift', '2'], win: ['ctrl', 'alt', 'shift', '2'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', '3'], win: ['ctrl', 'alt', '3'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', 'shift', '3'], win: ['ctrl', 'alt', 'shift', '3'] },
+  // { cmd: i18n`tab.contextMenu.horizontalSplit`, mac: ['cmd', 'alt', '4'], win: ['ctrl', 'alt', '4'] },
+  { id: 7, cmd: i18n`settings.keymap.showSettings`, mac: ['cmd', ','], win: ['ctrl', ','] },
+  { id: 8, cmd: i18n`file.goto`, mac: ['ctrl', 'g'], win: ['ctrl', 'g'] },
+  { id: 9, cmd: i18n`settings.keymap.toggleFormat`, mac: ['alt', 'l'], win: ['alt', 'l'] },
+  { id: 10, cmd: i18n`settings.keymap.toggleComment`, mac: ['cmd', '/'], win: ['ctrl', '/'] },
+  { id: 11, cmd: i18n`settings.keymap.into_zenmode`, mac: ['cmd', 'f11'], win: ['ctrl', 'f11'] },
+  { id: 12, cmd: i18n`settings.keymap.exit_zenmode`, mac: ['esc'], win: ['esc'] },
+]
+
 export default observer(({ content }) => (
   <div>
     <h2 className='settings-content-header'>{i18n`settings.keymap.main`}</h2>
@@ -13,6 +36,30 @@ export default observer(({ content }) => (
           settingItem={settingItem}
         />
       )}
+      <table className="keymap-list">
+        <thead>
+          <tr>
+            <th>{i18n`settings.keymap.command`}</th>
+            <th>Mac {i18n`settings.keymap.keymap`}</th>
+            <th>Win {i18n`settings.keymap.keymap`}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {
+            keymaps.map(keymap => <Row key={keymap.id} {...keymap} />)
+          }
+        </tbody>
+      </table>
     </div>
   </div>
 ))
+
+const Row = ({ cmd, mac, win }) => {
+  return (
+    <tr>
+      <td>{cmd}</td>
+      <td>{mac.map(key => <span className="key" key={key}>{key}</span>)}</td>
+      <td>{win.map(key => <span className="key" key={key}>{key}</span>)}</td>
+    </tr>
+  );
+}

app/components/Tab/Changelog.jsx

@@ -1,14 +1,25 @@
 import React, { Component } from 'react'
-import marked from 'marked'
+import Remarkable from 'remarkable'
 import md from '../../../static/changelog/changelog.md'
 
 const style = {
   textAlign: 'left',
   marginTop: '2em'
 }
 
+const remarkable = new Remarkable('full', {
+  html: true,
+  xhtmlOut: false,
+  breaks: false,
+  langPrefix: 'language-',
+  linkify: true,
+  linkTarget: '_blank',
+  typographer: false,
+  quotes: '“”‘’',
+})
+
 const Changelog = () => (
-  <div dangerouslySetInnerHTML={{ __html: marked(md) }}
+  <div dangerouslySetInnerHTML={{ __html: remarkable.render(md) }}
     className='welcome-page' style={style}
   >
   </div>

app/i18n/en_US/file.json

@@ -21,4 +21,4 @@
    "uploadSucceed": "Upload succeed",
    "uploadFailed": "Upload failed",
    "preparingDownload": "Preparing files..."
-}
+}

app/i18n/en_US/settings.json

@@ -31,13 +31,27 @@
    },
    "keymap": {
     "main": "Keymap Setting",
-    "keyboardMode": "Editor Keyboard Mode"
+    "keymap": "Keymap",
+    "keyboardMode": "Editor Keyboard Mode",
+    "command": "Command",
+    "createFile": "Create File",
+    "createFolder": "Create Folder",
+    "saveFile": "Save File",
+    "commandPalette": "Command Palette",
+    "filePalette": "File Palette",
+    "showSettings": "Show Settings Modal",
+    "exitModal": "Exit Modal",
+    "gitCommit": "Git Commit",
+    "toggleFormat": "Code Format",
+    "toggleComment": "Toggle Comment",
+    "into_zenmode": "Into Zen Mode",
+    "exit_zenmode": "Exit Zen Mode"
    },
    "appearance": {
       "main": "Appearance Setting",
       "uiTheme": "UI theme",
       "uiThemeOption": {
-         "baseTheme": "Default",
+         "baseTheme": "White",
          "dark": "Dark"
       },
       "syntaxTheme": "Syntax Theme",

app/i18n/en_US/tab.json

@@ -11,4 +11,4 @@
       "verticalSplit": "Vertical Split",
       "horizontalSplit": "Horizontal Split"
    }
-}
+}

app/i18n/zh_CN/file.json

@@ -21,4 +21,4 @@
    "uploadSucceed": "上传完成",
    "uploadFailed": "上传失败",
    "preparingDownload": "正在准备下载文件..."
-}
+}

app/i18n/zh_CN/settings.json

@@ -30,13 +30,27 @@
    },
    "keymap": {
     "main": "快捷键",
-    "keyboardMode": "编辑器键盘模式"
+    "keymap": "快捷键",
+    "keyboardMode": "编辑器键盘模式",
+    "command": "命令",
+    "createFile": "新建文件",
+    "createFolder": "新建文件夹",
+    "saveFile": "保存文件",
+    "commandPalette": "命令调色板",
+    "filePalette": "文件调色板",
+    "showSettings": "调出设置面板",
+    "exitModal": "退出模态框",
+    "gitCommit": "Git 提交",
+    "toggleFormat": "代码格式化",
+    "toggleComment": "切换注释",
+    "into_zenmode": "进入禅模式",
+    "exit_zenmode": "退出禅模式"
    },
    "appearance": {
       "main": "样式",
       "uiTheme": "UI 主题",
       "uiThemeOption": {
-         "baseTheme": "默认",
+         "baseTheme": "白色",
          "dark": "黑色"
       },
       "syntaxTheme": "代码着色",

app/i18n/zh_CN/tab.json

@@ -11,4 +11,4 @@
       "verticalSplit": "垂直切分",
       "horizontalSplit": "水平切分"
    }
-}
+}

app/styles/core-ui/Settings.styl

@@ -58,6 +58,27 @@
     padding: 0 $padding-lr 10px;
     flex-grow: 1;
     overflow: auto;
+    table {
+      width: 100%;
+      tr {
+        height: 30px;
+        td {
+          padding: 0 10px;
+        }
+        .key {
+          padding: 2px 6px;
+          margin: 0 4px;
+          border-radius: 2px;
+          color: #333;
+          background-color: #d6d6d6;
+        }
+      }
+      tbody {
+        tr:nth-child(odd) {
+          background-color: #f6f6f6;
+        }
+      }
+    }
   }
   .settings-content-controls {
     flex-grow: 0;

app/styles/dark/index.styl

@@ -17,6 +17,7 @@
 @import './styles/mask';
 @import './styles/git-merge';
 @import './styles/diff';
+@import './styles/settings';
 
 // 插件用样式
 @import './styles/weapp';

app/styles/dark/styles/settings.styl

@@ -0,0 +1,17 @@
+.settings-content {
+  .settings-content-container {
+    table {
+      tr {
+        .key {
+          color: #fff;
+          background-color: #666;
+        }
+      }
+      tbody {
+        tr:nth-child(odd) {
+          background-color: #444;
+        }
+      }
+    }
+  }
+}