From 101e5d5035b459929feeac026574fb4af2409397 Mon Sep 17 00:00:00 2001 From: mehr-licht Date: Sun, 18 Nov 2018 19:22:05 +0000 Subject: [PATCH 1/2] included shortcut for Info Panel --- browser/components/render/MermaidRender.js | 2 +- browser/main/Detail/MarkdownNoteDetail.js | 55 ++++++++++++++++++++++ browser/main/Detail/SnippetNoteDetail.js | 12 +++++ browser/main/SideNav/StorageItem.js | 2 +- 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/browser/components/render/MermaidRender.js b/browser/components/render/MermaidRender.js index 7a3b3ea2c..e28e06ea9 100644 --- a/browser/components/render/MermaidRender.js +++ b/browser/components/render/MermaidRender.js @@ -25,7 +25,7 @@ function render (element, content, theme) { if (height && height.value !== 'undefined') { element.style.height = height.value + 'vh' } - let isDarkTheme = theme === 'dark' || theme === 'solarized-dark' || theme === 'monokai' || theme === 'dracula' + const isDarkTheme = theme === 'dark' || theme === 'solarized-dark' || theme === 'monokai' || theme === 'dracula' mermaidAPI.initialize({ theme: isDarkTheme ? 'dark' : 'default', themeCSS: isDarkTheme ? darkThemeStyling : '', diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 116fdec0a..d4e9d9168 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -190,6 +190,60 @@ class MarkdownNoteDetail extends React.Component { ee.emit('export:save-html') } + handleKeyDown (e) { + switch (e.keyCode) { + // tab key + case 9: + if (e.ctrlKey && !e.shiftKey) { + e.preventDefault() + this.jumpNextTab() + } else if (e.ctrlKey && e.shiftKey) { + e.preventDefault() + this.jumpPrevTab() + } else if (!e.ctrlKey && !e.shiftKey && e.target === this.refs.description) { + e.preventDefault() + this.focusEditor() + } + break + // I key + case 73: + { + const isSuper = global.process.platform === 'darwin' + ? e.metaKey + : e.ctrlKey + if (isSuper) { + e.preventDefault() + this.handleInfoButtonClick(e) + } + } + break + // L key + case 76: + { + const isSuper = global.process.platform === 'darwin' + ? e.metaKey + : e.ctrlKey + if (isSuper) { + e.preventDefault() + this.focus() + } + } + break + // T key + case 84: + { + const isSuper = global.process.platform === 'darwin' + ? e.metaKey + : e.ctrlKey + if (isSuper && !e.shiftKey && !e.altKey) { + e.preventDefault() + this.addSnippet() + } + } + break + } + } + handleTrashButtonClick (e) { const { note } = this.state const { isTrashed } = note @@ -458,6 +512,7 @@ class MarkdownNoteDetail extends React.Component {
this.handleKeyDown(e)} > {location.pathname === '/trashed' ? trashTopBar : detailTopBar} diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index afd811020..4a38ffe59 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -434,6 +434,18 @@ class SnippetNoteDetail extends React.Component { this.focusEditor() } break + // I key + case 73: + { + const isSuper = global.process.platform === 'darwin' + ? e.metaKey + : e.ctrlKey + if (isSuper) { + e.preventDefault() + this.handleInfoButtonClick(e) + } + } + break // L key case 76: { diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js index d17314b3b..7b5caf72e 100644 --- a/browser/main/SideNav/StorageItem.js +++ b/browser/main/SideNav/StorageItem.js @@ -274,7 +274,7 @@ class StorageItem extends React.Component { const { folderNoteMap, trashedSet } = data const SortableStorageItemChild = SortableElement(StorageItemChild) const folderList = storage.folders.map((folder, index) => { - let folderRegex = new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + escapeStringRegexp(path.sep) + 'folders' + escapeStringRegexp(path.sep) + folder.key) + const folderRegex = new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + escapeStringRegexp(path.sep) + 'folders' + escapeStringRegexp(path.sep) + folder.key) const isActive = !!(location.pathname.match(folderRegex)) const noteSet = folderNoteMap.get(storage.key + '-' + folder.key) From 92e2cd102e9230d24a55e0c7552595e2a386faaf Mon Sep 17 00:00:00 2001 From: mehr-licht Date: Mon, 19 Nov 2018 19:00:51 +0000 Subject: [PATCH 2/2] deleted ctr+l and ctrl+t --- browser/main/Detail/MarkdownNoteDetail.js | 24 ----------------------- 1 file changed, 24 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index d4e9d9168..b4e7a5b34 100755 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -217,30 +217,6 @@ class MarkdownNoteDetail extends React.Component { } } break - // L key - case 76: - { - const isSuper = global.process.platform === 'darwin' - ? e.metaKey - : e.ctrlKey - if (isSuper) { - e.preventDefault() - this.focus() - } - } - break - // T key - case 84: - { - const isSuper = global.process.platform === 'darwin' - ? e.metaKey - : e.ctrlKey - if (isSuper && !e.shiftKey && !e.altKey) { - e.preventDefault() - this.addSnippet() - } - } - break } }