From 6e45ee6a3870744fcb4f15e5e50042d0ba1f57e8 Mon Sep 17 00:00:00 2001 From: mehdi Date: Mon, 24 Jun 2019 06:10:31 +0900 Subject: [PATCH 1/6] add Date ISO 8601 format --- browser/components/CodeEditor.js | 12 ++++++++++-- browser/components/MarkdownEditor.js | 1 + browser/components/MarkdownSplitEditor.js | 1 + browser/main/Detail/SnippetNoteDetail.js | 1 + browser/main/lib/ConfigManager.js | 3 ++- browser/main/modals/PreferencesModal/UiTab.js | 12 +++++++++++- package.json | 2 +- 7 files changed, 27 insertions(+), 5 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 1abd15a9e..3564fdb84 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -208,7 +208,11 @@ export default class CodeEditor extends React.Component { 'Ctrl-/': function (cm) { if (global.process.platform === 'darwin') { return } const dateNow = new Date() - cm.replaceSelection(dateNow.toLocaleDateString()) + if (self.props.dateISO8601) { + cm.replaceSelection(dateNow.toISOString().split('T')[0]) + } else { + cm.replaceSelection(dateNow.toLocaleDateString()) + } }, 'Cmd-/': function (cm) { if (global.process.platform !== 'darwin') { return } @@ -218,7 +222,11 @@ export default class CodeEditor extends React.Component { 'Shift-Ctrl-/': function (cm) { if (global.process.platform === 'darwin') { return } const dateNow = new Date() - cm.replaceSelection(dateNow.toLocaleString()) + if (self.props.dateISO8601) { + cm.replaceSelection(dateNow.toISOString()) + } else { + cm.replaceSelection(dateNow.toLocaleString()) + } }, 'Shift-Cmd-/': function (cm) { if (global.process.platform !== 'darwin') { return } diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index e956655c2..e0035535b 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -321,6 +321,7 @@ class MarkdownEditor extends React.Component { switchPreview={config.editor.switchPreview} enableMarkdownLint={config.editor.enableMarkdownLint} customMarkdownLintConfig={config.editor.customMarkdownLintConfig} + dateISO8601={config.ui.dateFormatISO8601} />
this.handleMouseDown(e)} >
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 7503addba..e8b8b5665 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -738,6 +738,7 @@ class SnippetNoteDetail extends React.Component { enableSmartPaste={config.editor.enableSmartPaste} hotkey={config.hotkey} autoDetect={autoDetect} + dateISO8601={config.ui.dateFormatISO8601} /> }
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index bea019fa9..de2c3c612 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -39,7 +39,8 @@ export const DEFAULT_CONFIG = { showCopyNotification: true, disableDirectWrite: false, defaultNote: 'ALWAYS_ASK', // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE' - showMenuBar: false + showMenuBar: false, + dateFormatISO8601: false }, editor: { theme: 'base16-light', diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index f74dbda52..c374bf5f1 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -78,6 +78,7 @@ class UiTab extends React.Component { saveTagsAlphabetically: this.refs.saveTagsAlphabetically.checked, enableLiveNoteCounts: this.refs.enableLiveNoteCounts.checked, showMenuBar: this.refs.showMenuBar.checked, + dateFormatISO8601: this.refs.dateFormatISO8601.checked, disableDirectWrite: this.refs.uiD2w != null ? this.refs.uiD2w.checked : false @@ -293,7 +294,16 @@ class UiTab extends React.Component {
: null } - +
+ +
Tags
diff --git a/package.json b/package.json index 0893e6812..aad1fc3be 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "boost", "productName": "Boostnote", - "version": "0.11.17", + "version": "0.11.17", "main": "index.js", "description": "Boostnote", "license": "GPL-3.0", From 80a63f7404eca17cbcf142ebc2657df2f343c1d6 Mon Sep 17 00:00:00 2001 From: mehdi Date: Mon, 8 Jul 2019 19:27:23 +0900 Subject: [PATCH 2/6] refactor: move the config down to editor setting --- browser/components/CodeEditor.js | 4 ++-- browser/components/MarkdownEditor.js | 3 ++- browser/components/MarkdownSplitEditor.js | 3 ++- browser/main/Detail/SnippetNoteDetail.js | 3 ++- browser/main/lib/ConfigManager.js | 7 ++++--- browser/main/modals/PreferencesModal/UiTab.js | 20 +++++++++++++++---- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 3564fdb84..a9dc09024 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -208,7 +208,7 @@ export default class CodeEditor extends React.Component { 'Ctrl-/': function (cm) { if (global.process.platform === 'darwin') { return } const dateNow = new Date() - if (self.props.dateISO8601) { + if (self.props.dateFormatISO8601) { cm.replaceSelection(dateNow.toISOString().split('T')[0]) } else { cm.replaceSelection(dateNow.toLocaleDateString()) @@ -222,7 +222,7 @@ export default class CodeEditor extends React.Component { 'Shift-Ctrl-/': function (cm) { if (global.process.platform === 'darwin') { return } const dateNow = new Date() - if (self.props.dateISO8601) { + if (self.props.dateFormatISO8601) { cm.replaceSelection(dateNow.toISOString()) } else { cm.replaceSelection(dateNow.toLocaleString()) diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index e0035535b..aa96195a7 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -321,7 +321,8 @@ class MarkdownEditor extends React.Component { switchPreview={config.editor.switchPreview} enableMarkdownLint={config.editor.enableMarkdownLint} customMarkdownLintConfig={config.editor.customMarkdownLintConfig} - dateISO8601={config.ui.dateFormatISO8601} + // dateISO8601={config.ui.dateFormatISO8601} + dateFormatISO8601={config.editor.dateFormatISO8601} />
this.handleMouseDown(e)} >
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index e8b8b5665..f43b09761 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -738,7 +738,8 @@ class SnippetNoteDetail extends React.Component { enableSmartPaste={config.editor.enableSmartPaste} hotkey={config.hotkey} autoDetect={autoDetect} - dateISO8601={config.ui.dateFormatISO8601} + // dateISO8601={config.ui.dateFormatISO8601} + dateFormatISO8601={config.editor.dateFormatISO8601} /> }
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index de2c3c612..e92e054ba 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -39,8 +39,8 @@ export const DEFAULT_CONFIG = { showCopyNotification: true, disableDirectWrite: false, defaultNote: 'ALWAYS_ASK', // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE' - showMenuBar: false, - dateFormatISO8601: false + showMenuBar: false + // dateFormatISO8601: false }, editor: { theme: 'base16-light', @@ -66,7 +66,8 @@ export const DEFAULT_CONFIG = { spellcheck: false, enableSmartPaste: false, enableMarkdownLint: false, - customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG + customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG, + dateFormatISO8601: false }, preview: { fontSize: '14', diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index c374bf5f1..7d16f3901 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -78,7 +78,7 @@ class UiTab extends React.Component { saveTagsAlphabetically: this.refs.saveTagsAlphabetically.checked, enableLiveNoteCounts: this.refs.enableLiveNoteCounts.checked, showMenuBar: this.refs.showMenuBar.checked, - dateFormatISO8601: this.refs.dateFormatISO8601.checked, + // dateFormatISO8601: this.refs.dateFormatISO8601.checked, disableDirectWrite: this.refs.uiD2w != null ? this.refs.uiD2w.checked : false @@ -106,7 +106,8 @@ class UiTab extends React.Component { spellcheck: this.refs.spellcheck.checked, enableSmartPaste: this.refs.enableSmartPaste.checked, enableMarkdownLint: this.refs.enableMarkdownLint.checked, - customMarkdownLintConfig: this.customMarkdownLintConfigCM.getCodeMirror().getValue() + customMarkdownLintConfig: this.customMarkdownLintConfigCM.getCodeMirror().getValue(), + dateFormatISO8601: this.refs.dateFormatISO8601.checked }, preview: { fontSize: this.refs.previewFontSize.value, @@ -294,7 +295,7 @@ class UiTab extends React.Component {
: null } -
+ {/*
-
+
*/}
Tags
@@ -610,6 +611,17 @@ class UiTab extends React.Component {
+
+ +
+
{i18n.__('Matching character pairs')} From 928e0edf4dc5783b6148aa1d46c9ee0b3a7f14aa Mon Sep 17 00:00:00 2001 From: mehdi Date: Mon, 29 Jul 2019 16:24:42 +0900 Subject: [PATCH 3/6] forgot to remove commented code --- browser/components/MarkdownEditor.js | 1 - browser/components/MarkdownSplitEditor.js | 1 - browser/main/Detail/SnippetNoteDetail.js | 1 - browser/main/lib/ConfigManager.js | 1 - browser/main/modals/PreferencesModal/UiTab.js | 12 +----------- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index aa96195a7..9fcb8b3f6 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -321,7 +321,6 @@ class MarkdownEditor extends React.Component { switchPreview={config.editor.switchPreview} enableMarkdownLint={config.editor.enableMarkdownLint} customMarkdownLintConfig={config.editor.customMarkdownLintConfig} - // dateISO8601={config.ui.dateFormatISO8601} dateFormatISO8601={config.editor.dateFormatISO8601} />
this.handleMouseDown(e)} > diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index f43b09761..354401900 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -738,7 +738,6 @@ class SnippetNoteDetail extends React.Component { enableSmartPaste={config.editor.enableSmartPaste} hotkey={config.hotkey} autoDetect={autoDetect} - // dateISO8601={config.ui.dateFormatISO8601} dateFormatISO8601={config.editor.dateFormatISO8601} /> } diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index e92e054ba..e85cb8c15 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -40,7 +40,6 @@ export const DEFAULT_CONFIG = { disableDirectWrite: false, defaultNote: 'ALWAYS_ASK', // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE' showMenuBar: false - // dateFormatISO8601: false }, editor: { theme: 'base16-light', diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index 7d16f3901..021ccf37c 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -78,7 +78,6 @@ class UiTab extends React.Component { saveTagsAlphabetically: this.refs.saveTagsAlphabetically.checked, enableLiveNoteCounts: this.refs.enableLiveNoteCounts.checked, showMenuBar: this.refs.showMenuBar.checked, - // dateFormatISO8601: this.refs.dateFormatISO8601.checked, disableDirectWrite: this.refs.uiD2w != null ? this.refs.uiD2w.checked : false @@ -295,16 +294,7 @@ class UiTab extends React.Component {
: null } - {/*
- -
*/} +
Tags
From bdfe8c0445f3971ae3016a6fd0caa6f3af33d4e2 Mon Sep 17 00:00:00 2001 From: lockee14 Date: Thu, 12 Sep 2019 08:14:39 +0900 Subject: [PATCH 4/6] add a comma at the end of line 73 --- browser/main/lib/ConfigManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index 91f22218f..87a9fcfe3 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -70,7 +70,7 @@ export const DEFAULT_CONFIG = { enableSmartPaste: false, enableMarkdownLint: false, customMarkdownLintConfig: DEFAULT_MARKDOWN_LINT_CONFIG, - dateFormatISO8601: false + dateFormatISO8601: false, prettierConfig: ` { "trailingComma": "es5", "tabWidth": 4, From b84f1173b7c37161ae7be0ee45b3b205f9c6e95f Mon Sep 17 00:00:00 2001 From: lockee14 Date: Thu, 12 Sep 2019 08:15:42 +0900 Subject: [PATCH 5/6] add a comma at the end of line 114 --- browser/main/modals/PreferencesModal/UiTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index b51e57d1e..4e590be64 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -111,7 +111,7 @@ class UiTab extends React.Component { enableSmartPaste: this.refs.enableSmartPaste.checked, enableMarkdownLint: this.refs.enableMarkdownLint.checked, customMarkdownLintConfig: this.customMarkdownLintConfigCM.getCodeMirror().getValue(), - dateFormatISO8601: this.refs.dateFormatISO8601.checked + dateFormatISO8601: this.refs.dateFormatISO8601.checked, prettierConfig: this.prettierConfigCM.getCodeMirror().getValue(), deleteUnusedAttachments: this.refs.deleteUnusedAttachments.checked }, From 2b3538d3b1b001ea4da0c36cdd7356eac32687ea Mon Sep 17 00:00:00 2001 From: lockee14 Date: Thu, 12 Sep 2019 08:30:53 +0900 Subject: [PATCH 6/6] add indentation and closing brace missing indentation and brace between line 229 - 234: before: 'Shift-Cmd-/': function (cm) { if (global.process.platform !== 'darwin') { return } [translateHotkey(hotkey.insertDateTime)]: function (cm) { const dateNow = new Date() cm.replaceSelection(dateNow.toLocaleString()) }, after: 'Shift-Cmd-/': function (cm) { if (global.process.platform !== 'darwin') { return } [translateHotkey(hotkey.insertDateTime)]: function (cm) { const dateNow = new Date() cm.replaceSelection(dateNow.toLocaleString()) } }, --- browser/components/CodeEditor.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index b35211864..7a298b476 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -228,9 +228,10 @@ export default class CodeEditor extends React.Component { }, 'Shift-Cmd-/': function (cm) { if (global.process.platform !== 'darwin') { return } - [translateHotkey(hotkey.insertDateTime)]: function (cm) { - const dateNow = new Date() - cm.replaceSelection(dateNow.toLocaleString()) + [translateHotkey(hotkey.insertDateTime)]: function (cm) { + const dateNow = new Date() + cm.replaceSelection(dateNow.toLocaleString()) + } }, Enter: 'boostNewLineAndIndentContinueMarkdownList', 'Ctrl-C': cm => {