From 235d71d6a021c7898cd6753ab7863d3e01064368 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 18 Jul 2018 15:04:02 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Koenig=20-=20Fixed=20required=20?=
 =?UTF-8?q?double-click=20on=20(+)=20when=20cursor=20is=20not=20in=20same?=
 =?UTF-8?q?=20paragraph?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs https://github.com/TryGhost/Ghost/issues/9724
- ignore the range change which would otherwise close the menu when clicking a (+) next to a different paragraph then the one the cursor is currently on
---
 .../lib/koenig-editor/addon/components/koenig-plus-menu.js    | 4 +++-
 .../addon/templates/components/koenig-plus-menu.hbs           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js
index 7f3f3395ad..382d4ed825 100644
--- a/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js
+++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-plus-menu.js
@@ -66,11 +66,12 @@ export default Component.extend({
         }
 
         // hide the menu if the editor range has changed
-        if (this.showMenu && editorRange && !editorRange.isBlank && !editorRange.isEqual(this._lastEditorRange)) {
+        if (!this._ignoreRangeChange && this.showMenu && editorRange && !editorRange.isBlank && !editorRange.isEqual(this._lastEditorRange)) {
             this._hideMenu();
         }
 
         this._lastEditorRange = editorRange;
+        this._ignoreRangeChange = false;
     },
 
     willDestroyElement() {
@@ -273,6 +274,7 @@ export default Component.extend({
     },
 
     _moveCaretToCachedEditorRange() {
+        this._ignoreRangeChange = true;
         this.set('editorRange', this._editorRange);
         this.editor.selectRange(this._editorRange);
     }
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
index 6c7f950082..354958c460 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-plus-menu.hbs
@@ -1,5 +1,5 @@
 {{#if showButton}}
-    <button class="koenig-plus-menu-button flex justify-center items-center relative w9 h9 ba b--midlightgrey-l2 bg-white br-100 anim-normal" {{action "openMenu"}}>{{svg-jar "plus" class="w4 h4 stroke-middarkgrey i-strokew--2"}}</button>
+    <button class="koenig-plus-menu-button flex justify-center items-center relative w9 h9 ba b--midlightgrey-l2 bg-white br-100 anim-normal" onclick={{action "openMenu"}}>{{svg-jar "plus" class="w4 h4 stroke-middarkgrey i-strokew--2"}}</button>
 {{/if}}
 
 {{#if showMenu}}