From 25810916524f94a5699d4252a7be6b831e0a4d6b Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 16 Dec 2017 23:17:45 +0900 Subject: [PATCH 01/16] add editorType into ConfigManager --- browser/main/lib/ConfigManager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index fc9b4ee9..4e04ad70 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -35,7 +35,8 @@ export const DEFAULT_CONFIG = { indentType: 'space', indentSize: '2', switchPreview: 'BLUR', // Available value: RIGHTCLICK, BLUR - scrollPastEnd: false + scrollPastEnd: false, + type: 'default' }, preview: { fontSize: '14', From 8ba0d10f40ed971eb939af34d46e6468f834cc3e Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 17 Dec 2017 02:02:19 +0900 Subject: [PATCH 02/16] set editorType into Config and state --- browser/main/Detail/MarkdownNoteDetail.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 25c993d0..469fc7ab 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -15,6 +15,7 @@ import StatusBar from '../StatusBar' import _ from 'lodash' import { findNoteTitle } from 'browser/lib/findNoteTitle' import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' +import ConfigManager from 'browser/main/lib/ConfigManager' import TrashButton from './TrashButton' import PermanentDeleteButton from './PermanentDeleteButton' import InfoButton from './InfoButton' @@ -39,7 +40,8 @@ class MarkdownNoteDetail extends React.Component { content: '' }, props.note), isLockButtonShown: false, - isLocked: false + isLocked: false, + editorType: props.config.editor.type } this.dispatchTimer = null @@ -262,6 +264,14 @@ class MarkdownNoteDetail extends React.Component { ee.emit('print') } + handleSwitchMode (type) { + this.setState({ editorType: type }, () => { + const newConfig = Object.assign({}, this.props.config) + newConfig.editor.type = type + ConfigManager.set(newConfig) + }) + } + render () { const { data, config, location } = this.props const { note } = this.state @@ -320,10 +330,10 @@ class MarkdownNoteDetail extends React.Component { />
-
+
this.handleSwitchMode('SPLIT')}>
-
+
this.handleSwitchMode('DEFAULT')}>
From 977e80c82931502888f513fb605cbe9092fc4f14 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sun, 17 Dec 2017 02:07:07 +0900 Subject: [PATCH 03/16] apply switching style --- browser/main/Detail/MarkdownNoteDetail.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 469fc7ab..baaf63f9 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -274,7 +274,7 @@ class MarkdownNoteDetail extends React.Component { render () { const { data, config, location } = this.props - const { note } = this.state + const { note, editorType } = this.state const storageKey = note.storage const folderKey = note.folder @@ -330,10 +330,10 @@ class MarkdownNoteDetail extends React.Component { />
-
this.handleSwitchMode('SPLIT')}> +
this.handleSwitchMode('SPLIT')}>
-
this.handleSwitchMode('DEFAULT')}> +
this.handleSwitchMode('DEFAULT')}>
From 8e81609a39aa3368c1a743caa4fe1a09a0058de3 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 17:40:06 +0900 Subject: [PATCH 04/16] implement minimun splitEditor --- browser/components/MarkdownSplitEditor.js | 21 +++++++++++++++ browser/components/MarkdownSplitEditor.styl | 9 +++++++ browser/main/Detail/MarkdownNoteDetail.js | 29 ++++++++++++++------- 3 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 browser/components/MarkdownSplitEditor.js create mode 100644 browser/components/MarkdownSplitEditor.styl diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js new file mode 100644 index 00000000..7118c059 --- /dev/null +++ b/browser/components/MarkdownSplitEditor.js @@ -0,0 +1,21 @@ +import React from 'react' + +import styles from './MarkdownSplitEditor.styl' +import CSSModules from 'browser/lib/CSSModules' + +class MarkdownSplitEditor extends React.Component { + render () { + return ( +
+
+

editor

+
+
+

preview

+
+
+ ) + } +} + +export default CSSModules(MarkdownSplitEditor, styles) diff --git a/browser/components/MarkdownSplitEditor.styl b/browser/components/MarkdownSplitEditor.styl new file mode 100644 index 00000000..c439bed9 --- /dev/null +++ b/browser/components/MarkdownSplitEditor.styl @@ -0,0 +1,9 @@ +.root + width 100% + height 100% + font-size 30px + display flex + .editor + width 50% + .preview + width 50% diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index baaf63f9..39db6c3c 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -3,6 +3,7 @@ import React from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './MarkdownNoteDetail.styl' import MarkdownEditor from 'browser/components/MarkdownEditor' +import MarkdownSplitEditor from 'browser/components/MarkdownSplitEditor' import TodoListPercentage from 'browser/components/TodoListPercentage' import StarButton from './StarButton' import TagSelect from './TagSelect' @@ -272,6 +273,24 @@ class MarkdownNoteDetail extends React.Component { }) } + renderEditor () { + const { config, ignorePreviewPointerEvents } = this.props + const { note } = this.state + if (this.state.editorType === 'SPLIT') { + return + } else { + return this.handleChange(e)} + ignorePreviewPointerEvents={ignorePreviewPointerEvents} + /> + } + } + render () { const { data, config, location } = this.props const { note, editorType } = this.state @@ -400,15 +419,7 @@ class MarkdownNoteDetail extends React.Component { {location.pathname === '/trashed' ? trashTopBar : detailTopBar}
- this.handleChange(e)} - ignorePreviewPointerEvents={this.props.ignorePreviewPointerEvents} - /> + {this.renderEditor()}
Date: Mon, 18 Dec 2017 18:26:25 +0900 Subject: [PATCH 05/16] implement splitEditor --- browser/components/MarkdownSplitEditor.js | 55 ++++++++++++++++++++++- browser/main/Detail/MarkdownNoteDetail.js | 8 +++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index 7118c059..8dcf0835 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -1,17 +1,68 @@ import React from 'react' +import CodeEditor from 'browser/components/CodeEditor' +import MarkdownPreview from 'browser/components/MarkdownPreview' +import { findStorage } from 'browser/lib/findStorage' import styles from './MarkdownSplitEditor.styl' import CSSModules from 'browser/lib/CSSModules' class MarkdownSplitEditor extends React.Component { + constructor (props) { + super(props) + this.state = { + value: props.value + } + this.value = props.value + this.focus = () => this.refs.code.focus() + this.reload = () => this.refs.code.reload() + } + + componentWillReceiveProps (props) { + this.setState({ value: props.value }) + } + + handleOnChange (e) { + const value = this.refs.code.value + this.setState({ value }, () => { + this.value = value + this.props.onChange() + }) + } + render () { + const { config, storageKey } = this.props + const { value } = this.state + const storage = findStorage(storageKey) return (
-

editor

+ this.handleOnChange(e)} + />
-

preview

+
) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 39db6c3c..e49dff83 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -277,7 +277,13 @@ class MarkdownNoteDetail extends React.Component { const { config, ignorePreviewPointerEvents } = this.props const { note } = this.state if (this.state.editorType === 'SPLIT') { - return + return this.handleChange(e)} + /> } else { return Date: Mon, 18 Dec 2017 18:39:40 +0900 Subject: [PATCH 06/16] fix style --- browser/components/MarkdownSplitEditor.js | 56 ++++++++++----------- browser/components/MarkdownSplitEditor.styl | 2 +- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index 8dcf0835..84f31af3 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -35,35 +35,33 @@ class MarkdownSplitEditor extends React.Component { const storage = findStorage(storageKey) return (
-
- this.handleOnChange(e)} - /> -
-
- -
+ this.handleOnChange(e)} + /> +
) } diff --git a/browser/components/MarkdownSplitEditor.styl b/browser/components/MarkdownSplitEditor.styl index c439bed9..c9afd22f 100644 --- a/browser/components/MarkdownSplitEditor.styl +++ b/browser/components/MarkdownSplitEditor.styl @@ -3,7 +3,7 @@ height 100% font-size 30px display flex - .editor + .codeEditor width 50% .preview width 50% From caaa7a9e74c772bcbf1bdde928aa97fdadf2e045 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 18:42:35 +0900 Subject: [PATCH 07/16] implement checkbox --- browser/components/MarkdownSplitEditor.js | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index 84f31af3..92ae0ce5 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -29,6 +29,29 @@ class MarkdownSplitEditor extends React.Component { }) } + handleCheckboxClick (e) { + e.preventDefault() + e.stopPropagation() + const idMatch = /checkbox-([0-9]+)/ + const checkedMatch = /\[x\]/i + const uncheckedMatch = /\[ \]/ + if (idMatch.test(e.target.getAttribute('id'))) { + const lineIndex = parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1 + const lines = this.refs.code.value + .split('\n') + + const targetLine = lines[lineIndex] + + if (targetLine.match(checkedMatch)) { + lines[lineIndex] = targetLine.replace(checkedMatch, '[ ]') + } + if (targetLine.match(uncheckedMatch)) { + lines[lineIndex] = targetLine.replace(uncheckedMatch, '[x]') + } + this.refs.code.setValue(lines.join('\n')) + } + } + render () { const { config, storageKey } = this.props const { value } = this.state @@ -59,6 +82,7 @@ class MarkdownSplitEditor extends React.Component { ref='preview' tabInde='0' value={value} + onCheckboxClick={(e) => this.handleCheckboxClick(e)} showCopyNotification={config.ui.showCopyNotification} storagePath={storage.path} /> From e682ee8541a6c01d73a6cd89b51440334d5fe711 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 18:52:33 +0900 Subject: [PATCH 08/16] avoid handling events for not split editor --- browser/components/MarkdownPreview.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index a3e7bb93..c9d3d963 100644 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -144,10 +144,12 @@ export default class MarkdownPreview extends React.Component { } handleContextMenu (e) { + if (!this.props.onContextMenu) return this.props.onContextMenu(e) } handleMouseDown (e) { + if (!this.props.onMouseDown) return if (e.target != null) { switch (e.target.tagName) { case 'A': @@ -159,6 +161,7 @@ export default class MarkdownPreview extends React.Component { } handleMouseUp (e) { + if (!this.props.onMouseUp) return if (e.target != null && e.target.tagName === 'A') { return null } From f5ccaa7b4808e953baebc4bb2f10fac425b4af9f Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 18:52:59 +0900 Subject: [PATCH 09/16] fix word-wrap --- browser/components/markdown.styl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl index 53e93574..0600d9ab 100644 --- a/browser/components/markdown.styl +++ b/browser/components/markdown.styl @@ -120,6 +120,7 @@ hr margin 15px 0 h1, h2, h3, h4, h5, h6 font-weight bold + word-wrap break-word h1 font-size 2.55em padding-bottom 0.3em @@ -157,6 +158,7 @@ p line-height 1.6em margin 0 0 1em white-space pre-line + word-wrap break-word img max-width 100% strong, b @@ -338,4 +340,4 @@ body[data-theme="dark"] body[data-theme="solarized-dark"] color $ui-solarized-dark-text-color border-color themeDarkBorder - background-color $ui-solarized-dark-noteDetail-backgroundColor \ No newline at end of file + background-color $ui-solarized-dark-noteDetail-backgroundColor From 50d89a8ec91596f4884f29db484ac98ac5cda7c7 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 19:21:52 +0900 Subject: [PATCH 10/16] fix to apply fontSize and fontFamily --- browser/components/MarkdownSplitEditor.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index 92ae0ce5..712010c4 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -75,7 +75,8 @@ class MarkdownSplitEditor extends React.Component { styleName='preview' theme={config.ui.theme} keyMap={config.editor.keyMap} - fontSize={config.preview.fontFamily} + fontSize={config.preview.fontSize} + fontFamily={config.preview.fontFamily} codeBlockTheme={config.preview.codeBlockTheme} codeBlockFontFamily={config.editor.fontFamily} lineNumber={config.preview.lineNumber} From c80bdb8d0c2ca732003ecda61d0eae9cbd585ef7 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 19:28:42 +0900 Subject: [PATCH 11/16] apply ignorePreviewPointerEvents --- browser/components/MarkdownSplitEditor.js | 3 +++ browser/main/Detail/MarkdownNoteDetail.js | 1 + 2 files changed, 4 insertions(+) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index 712010c4..bf6ca304 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -56,6 +56,8 @@ class MarkdownSplitEditor extends React.Component { const { config, storageKey } = this.props const { value } = this.state const storage = findStorage(storageKey) + const previewStyle = {} + if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none' return (
this.handleOnChange(e)} /> this.handleChange(e)} + ignorePreviewPointerEvents={ignorePreviewPointerEvents} /> } else { return Date: Mon, 18 Dec 2017 19:31:43 +0900 Subject: [PATCH 12/16] remove an unnecessary valiable --- browser/main/Detail/MarkdownNoteDetail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 8c2c29a2..ed1762b1 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -299,7 +299,7 @@ class MarkdownNoteDetail extends React.Component { } render () { - const { data, config, location } = this.props + const { data, location } = this.props const { note, editorType } = this.state const storageKey = note.storage const folderKey = note.folder From 0e0e779cbe0f6ef34622005b2d4bf56f78a73e48 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Mon, 18 Dec 2017 21:38:58 +0900 Subject: [PATCH 13/16] remove unnecessary arg --- browser/components/MarkdownSplitEditor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index bf6ca304..f114d37d 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -21,7 +21,7 @@ class MarkdownSplitEditor extends React.Component { this.setState({ value: props.value }) } - handleOnChange (e) { + handleOnChange () { const value = this.refs.code.value this.setState({ value }, () => { this.value = value @@ -71,7 +71,7 @@ class MarkdownSplitEditor extends React.Component { indentType={config.editor.indentType} scrollPastEnd={config.editor.scrollPastEnd} storageKey={storageKey} - onChange={e => this.handleOnChange(e)} + onChange={this.handleOnChange.bind(this)} /> Date: Tue, 19 Dec 2017 03:46:20 +0900 Subject: [PATCH 14/16] remove unnecesarry state --- browser/components/MarkdownSplitEditor.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js index f114d37d..b77c0b6b 100644 --- a/browser/components/MarkdownSplitEditor.js +++ b/browser/components/MarkdownSplitEditor.js @@ -9,24 +9,14 @@ import CSSModules from 'browser/lib/CSSModules' class MarkdownSplitEditor extends React.Component { constructor (props) { super(props) - this.state = { - value: props.value - } this.value = props.value this.focus = () => this.refs.code.focus() this.reload = () => this.refs.code.reload() } - componentWillReceiveProps (props) { - this.setState({ value: props.value }) - } - handleOnChange () { - const value = this.refs.code.value - this.setState({ value }, () => { - this.value = value - this.props.onChange() - }) + this.value = this.refs.code.value + this.props.onChange() } handleCheckboxClick (e) { @@ -53,8 +43,7 @@ class MarkdownSplitEditor extends React.Component { } render () { - const { config, storageKey } = this.props - const { value } = this.state + const { config, value, storageKey } = this.props const storage = findStorage(storageKey) const previewStyle = {} if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none' From 72b450d5268eaf18344754f8ff6f128483b6a940 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Tue, 19 Dec 2017 10:21:01 +0900 Subject: [PATCH 15/16] icon updated --- browser/main/Detail/MarkdownNoteDetail.js | 8 +++--- browser/main/Detail/MarkdownNoteDetail.styl | 2 -- resources/icon/icon-WYSIWYG-off.svg | 27 --------------------- resources/icon/icon-WYSIWYG-on.svg | 16 ------------ resources/icon/icon-edit.svg | 21 ++++++++++++---- resources/icon/icon-full.svg | 15 ++++++++++++ resources/icon/icon-mode-markdown-off.svg | 23 ++++++++++++++++++ resources/icon/icon-mode-split-on.svg | 27 +++++++++++++++++++++ resources/icon/icon-previewoff-off.svg | 13 ++++++++++ resources/icon/icon-previewoff-on.svg | 13 ++++++++++ 10 files changed, 111 insertions(+), 54 deletions(-) delete mode 100644 resources/icon/icon-WYSIWYG-off.svg delete mode 100644 resources/icon/icon-WYSIWYG-on.svg create mode 100644 resources/icon/icon-full.svg create mode 100644 resources/icon/icon-mode-markdown-off.svg create mode 100644 resources/icon/icon-mode-split-on.svg create mode 100644 resources/icon/icon-previewoff-off.svg create mode 100644 resources/icon/icon-previewoff-on.svg diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index ed1762b1..558d0e11 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -236,7 +236,7 @@ class MarkdownNoteDetail extends React.Component { } getToggleLockButton () { - return this.state.isLocked ? '../resources/icon/icon-edit-lock.svg' : '../resources/icon/icon-edit.svg' + return this.state.isLocked ? '../resources/icon/icon-previewoff-on.svg' : '../resources/icon/icon-previewoff-off.svg' } handleDeleteKeyDown (e) { @@ -357,10 +357,10 @@ class MarkdownNoteDetail extends React.Component {
this.handleSwitchMode('SPLIT')}> - +
this.handleSwitchMode('DEFAULT')}> - +
@@ -396,7 +396,7 @@ class MarkdownNoteDetail extends React.Component { this.handleTrashButtonClick(e)} /> diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 9425e723..c2c189f9 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -48,8 +48,6 @@ cursor pointer &:first-child border-right 1px solid #eee - img - transform scale(0.7) .active background-color #fff box-shadow 2px 0px 7px #eee diff --git a/resources/icon/icon-WYSIWYG-off.svg b/resources/icon/icon-WYSIWYG-off.svg deleted file mode 100644 index ffd6088a..00000000 --- a/resources/icon/icon-WYSIWYG-off.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - icon-WYSIWYG-off - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-WYSIWYG-on.svg b/resources/icon/icon-WYSIWYG-on.svg deleted file mode 100644 index b8ee9489..00000000 --- a/resources/icon/icon-WYSIWYG-on.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon-WYSIWYG-on - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/resources/icon/icon-edit.svg b/resources/icon/icon-edit.svg index 3707c6fe..cb7d92cc 100644 --- a/resources/icon/icon-edit.svg +++ b/resources/icon/icon-edit.svg @@ -3,11 +3,22 @@ icon-edit Created with Sketch. - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-full.svg b/resources/icon/icon-full.svg new file mode 100644 index 00000000..621ebacc --- /dev/null +++ b/resources/icon/icon-full.svg @@ -0,0 +1,15 @@ + + + + icon-full + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-mode-markdown-off.svg b/resources/icon/icon-mode-markdown-off.svg new file mode 100644 index 00000000..7f6a0235 --- /dev/null +++ b/resources/icon/icon-mode-markdown-off.svg @@ -0,0 +1,23 @@ + + + + icon-mode-markdown-off + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-mode-split-on.svg b/resources/icon/icon-mode-split-on.svg new file mode 100644 index 00000000..338d2bd7 --- /dev/null +++ b/resources/icon/icon-mode-split-on.svg @@ -0,0 +1,27 @@ + + + + icon-mode-split-on + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-previewoff-off.svg b/resources/icon/icon-previewoff-off.svg new file mode 100644 index 00000000..b0e720e7 --- /dev/null +++ b/resources/icon/icon-previewoff-off.svg @@ -0,0 +1,13 @@ + + + + icon-previewoff-off + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/resources/icon/icon-previewoff-on.svg b/resources/icon/icon-previewoff-on.svg new file mode 100644 index 00000000..8a6c5d7e --- /dev/null +++ b/resources/icon/icon-previewoff-on.svg @@ -0,0 +1,13 @@ + + + + icon-previewoff-on + Created with Sketch. + + + + + + + + \ No newline at end of file From df13ca3c9289e1ce9fb6c8cc061ec14eb3f27c52 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 20 Dec 2017 18:11:01 +0900 Subject: [PATCH 16/16] make splitMode Default --- browser/main/Detail/MarkdownNoteDetail.js | 10 +++++----- browser/main/lib/ConfigManager.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 558d0e11..8d3acea9 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -276,9 +276,10 @@ class MarkdownNoteDetail extends React.Component { renderEditor () { const { config, ignorePreviewPointerEvents } = this.props const { note } = this.state - if (this.state.editorType === 'SPLIT') { - return } else { - return this.handleSwitchMode('SPLIT')}>
-
this.handleSwitchMode('DEFAULT')}> +
this.handleSwitchMode('EDITOR_PREVIEW')}>
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index 4e04ad70..3d70a7a3 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -36,7 +36,7 @@ export const DEFAULT_CONFIG = { indentSize: '2', switchPreview: 'BLUR', // Available value: RIGHTCLICK, BLUR scrollPastEnd: false, - type: 'default' + type: 'SPLIT' }, preview: { fontSize: '14',