From 2c409c3930c249c1aab79b0442bce2f5096f67d0 Mon Sep 17 00:00:00 2001 From: Todt Date: Wed, 27 Mar 2019 16:12:33 -0700 Subject: [PATCH 1/3] Changes and refactor of HandleMouseDown --- browser/components/MarkdownPreview.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 63d825f43..53f3ffb93 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -280,35 +280,33 @@ export default class MarkdownPreview extends React.Component { if (this.props.onDoubleClick != null) this.props.onDoubleClick(e) } - handleMouseDown (e) { + handleMouseDown(e) { const config = ConfigManager.get() + const clickElement = e.target + const targetTag = clickElement.tagName // The direct parent HTML of where was clicked ie "BODY" or "DIV" + const lineNumber = getSourceLineNumberByElement(clickElement) // Line location of element clicked. + + if (clickElement === null && targetTag !== "INPUT") { + return null + } + if (config.editor.switchPreview === 'RIGHTCLICK' && e.buttons === 2 && config.editor.type === 'SPLIT') { eventEmitter.emit('topbar:togglemodebutton', 'CODE') } if (e.ctrlKey) { if (config.editor.type === 'SPLIT') { - const clickElement = e.target - const lineNumber = getSourceLineNumberByElement(clickElement) if (lineNumber !== -1) { eventEmitter.emit('line:jump', lineNumber) } } else { - const clickElement = e.target - const lineNumber = getSourceLineNumberByElement(clickElement) if (lineNumber !== -1) { eventEmitter.emit('editor:focus') eventEmitter.emit('line:jump', lineNumber) } } } - if (e.target != null) { - switch (e.target.tagName) { - case 'A': - case 'INPUT': - return null - } - } - if (this.props.onMouseDown != null) this.props.onMouseDown(e) + + if (this.props.onMouseDown != null && targetTag === 'BODY') this.props.onMouseDown(e) } handleMouseUp (e) { From 44e39d2fbbe1460b10103117dec0acf73487cf5d Mon Sep 17 00:00:00 2001 From: Milo Todt Date: Wed, 27 Mar 2019 16:57:10 -0700 Subject: [PATCH 2/3] Update MarkdownPreview.js --- browser/components/MarkdownPreview.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 53f3ffb93..c44b96e37 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -286,10 +286,6 @@ export default class MarkdownPreview extends React.Component { const targetTag = clickElement.tagName // The direct parent HTML of where was clicked ie "BODY" or "DIV" const lineNumber = getSourceLineNumberByElement(clickElement) // Line location of element clicked. - if (clickElement === null && targetTag !== "INPUT") { - return null - } - if (config.editor.switchPreview === 'RIGHTCLICK' && e.buttons === 2 && config.editor.type === 'SPLIT') { eventEmitter.emit('topbar:togglemodebutton', 'CODE') } From 744a7bf26fd7b3fb8b051585479a975a74066f07 Mon Sep 17 00:00:00 2001 From: Milo Todt Date: Wed, 27 Mar 2019 18:01:10 -0700 Subject: [PATCH 3/3] Update MarkdownPreview.js --- browser/components/MarkdownPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index c44b96e37..028b5b6c7 100755 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -280,7 +280,7 @@ export default class MarkdownPreview extends React.Component { if (this.props.onDoubleClick != null) this.props.onDoubleClick(e) } - handleMouseDown(e) { + handleMouseDown (e) { const config = ConfigManager.get() const clickElement = e.target const targetTag = clickElement.tagName // The direct parent HTML of where was clicked ie "BODY" or "DIV"