Merge pull request #1 from BoostIO/master

update fork

Author: LeoLamCY

browser/components/CodeEditor.js

@@ -83,37 +83,7 @@ export default class CodeEditor extends React.Component {
         'Cmd-T': function (cm) {
           // Do nothing
         },
-        Enter: (cm) => {
-          const cursor = cm.getCursor()
-          const line = cm.getLine(cursor.line)
-          let bulletType
-          if (line.trim().startsWith('- ')) {
-            bulletType = 1 // dash
-          } else if (line.trim().startsWith('* ')) {
-            bulletType = 2 // star
-          } else if (line.trim().startsWith('+ ')) {
-            bulletType = 3 // plus
-          } else {
-            bulletType = 0 // not a bullet
-          }
-          const numberedListRegex = /^(\d+)\. .+/
-          const match = line.trim().match(numberedListRegex)
-          if (bulletType !== 0 || match) {
-            cm.execCommand('newlineAndIndent')
-            const range = {line: cursor.line + 1, ch: cm.getLine(cursor.line + 1).length}
-            if (match) {
-              cm.replaceRange((parseInt(match[1]) + 1) + '. ', range)
-            } else if (bulletType === 1) {
-              cm.replaceRange('- ', range)
-            } else if (bulletType === 2) {
-              cm.replaceRange('* ', range)
-            } else if (bulletType === 3) {
-              cm.replaceRange('+ ', range)
-            }
-          } else {
-            cm.execCommand('newlineAndIndent')
-          }
-        }
+        Enter: 'newlineAndIndentContinueMarkdownList'
       }
     })
 

browser/components/MarkdownEditor.js

@@ -11,7 +11,7 @@ class MarkdownEditor extends React.Component {
 
     this.escapeFromEditor = ['Control', 'w']
 
-    this.supportMdWordBold = ['Control', ':']
+    this.supportMdSelectionBold = ['Control', ':']
 
     this.state = {
       status: 'PREVIEW',
@@ -169,19 +169,26 @@ class MarkdownEditor extends React.Component {
     if (!this.state.isLocked && this.state.status === 'CODE' && this.escapeFromEditor.every(isNoteHandlerKey)) {
       document.activeElement.blur()
     }
-    if (this.supportMdWordBold.every(isNoteHandlerKey)) {
-      this.addMdBetweenWord('**')
+    if (this.supportMdSelectionBold.every(isNoteHandlerKey)) {
+      this.addMdAroundWord('**')
     }
   }
 
-  addMdBetweenWord (mdElement) {
+  addMdAroundWord (mdElement) {
+    if (this.refs.code.editor.getSelection()) {
+      return this.addMdAroundSelection(mdElement)
+    }
     const currentCaret = this.refs.code.editor.getCursor()
     const word = this.refs.code.editor.findWordAt(currentCaret)
     const cmDoc = this.refs.code.editor.getDoc()
     cmDoc.replaceRange(mdElement, word.anchor)
     cmDoc.replaceRange(mdElement, { line: word.head.line, ch: word.head.ch + mdElement.length })
   }
 
+  addMdAroundSelection (mdElement) {
+    this.refs.code.editor.replaceSelection(`${mdElement}${this.refs.code.editor.getSelection()}${mdElement}`)
+  }
+
   handleKeyUp (e) {
     const keyPressed = Object.assign(this.state.keyPressed, {
       [e.key]: false

browser/components/SideNavFilter.styl

@@ -21,6 +21,11 @@
     color #e74c3c
     .menu-button-label
       color $ui-text-color
+  &:active, &:active:hover
+    background-color $ui-button--active-backgroundColor
+    color #e74c3c
+    .menu-button-label
+      color $ui-text-color
 
 .menu-button-star--active
   @extend .menu-button
@@ -33,6 +38,11 @@
     color #F9BF3B
     .menu-button-label
       color $ui-text-color
+  &:active, &:active:hover
+    background-color $ui-button--active-backgroundColor
+    color #F9BF3B
+    .menu-button-label
+      color $ui-text-color
 
 .menu-button-label
   margin-left 5px

browser/components/SnippetTab.js

@@ -96,6 +96,7 @@ class SnippetTab extends React.Component {
         {!this.state.isRenaming
           ? <button styleName='button'
             onClick={(e) => this.handleClick(e)}
+            onDoubleClick={(e) => this.handleRenameClick(e)}
             onContextMenu={(e) => this.handleContextMenu(e)}
           >
             {snippet.name.trim().length > 0

browser/components/StorageItem.styl

@@ -38,7 +38,7 @@
   padding 0 15px
   height 26px
   line-height 26px
-  border-width 0 0 0 1px
+  border-width 0 0 0 2px
   border-style solid
   border-color transparent
   overflow hidden

browser/main/Detail/FolderSelect.styl

@@ -81,7 +81,7 @@
     background-color $ui-button--active-backgroundColor
     color $ui-button--active-color
 .search-optionList-item-name
-  border-left solid 4px transparent
+  border-left solid 2px transparent
   padding 2px 5px
 .search-optionList-item-name-surfix
   font-size 10px

browser/main/modals/InitModal.js

@@ -41,10 +41,6 @@ class InitModal extends React.Component {
     }
   }
 
-  handleCloseButtonClick (e) {
-    this.props.close()
-  }
-
   handlePathChange (e) {
     this.setState({
       path: e.target.value
@@ -187,12 +183,6 @@ class InitModal extends React.Component {
     })
   }
 
-  handleKeyDown (e) {
-    if (e.keyCode === 27) {
-      this.props.close()
-    }
-  }
-
   render () {
     if (this.state.isLoading) {
       return <div styleName='root--loading'>
@@ -209,9 +199,6 @@ class InitModal extends React.Component {
         <div styleName='header'>
           <div styleName='header-title'>Initialize Storage</div>
         </div>
-        <button styleName='closeButton'
-          onClick={(e) => this.handleCloseButtonClick(e)}
-        >Close</button>
         <div styleName='body'>
           <div styleName='body-welcome'>
             Welcome!

browser/main/modals/PreferencesModal/ConfigTab.styl

@@ -104,10 +104,17 @@
   margin-left: 10px
   font-size: 12px
 
+.code-mirror
+  width 400px
+  height 120px
+  margin 5px 0
+  font-size 12px
+
 colorDarkControl()
   border-color $ui-dark-borderColor
   background-color $ui-dark-backgroundColor
   color $ui-dark-text-color
+
 body[data-theme="dark"]
   .root
     color $ui-dark-text-color

browser/main/modals/PreferencesModal/HotkeyTab.js

@@ -139,6 +139,7 @@ class HotkeyTab extends React.Component {
                 <li><code>VolumeUp</code>, <code>VolumeDown</code> and <code>VolumeMute</code></li>
                 <li><code>MediaNextTrack</code>, <code>MediaPreviousTrack</code>, <code>MediaStop</code> and <code>MediaPlayPause</code></li>
                 <li><code>Control</code> (or <code>Ctrl</code> for short)</li>
+                <li><code>Shift</code></li>
               </ul>
             </div>
           }

browser/main/modals/PreferencesModal/StorageItem.styl

@@ -71,7 +71,7 @@
     background-color darken(white, 3%)
 .folderList-item-left
   height 30px
-  border-left solid 1px transparent
+  border-left solid 2px transparent
   padding 0 10px
   line-height 30px
   float left