From d735adddd4d3f212a6075c5463f77f90bf1eef90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ja=CC=81n=20Mikla=CC=81s=CC=8C?= Date: Thu, 2 May 2019 13:32:30 +0200 Subject: [PATCH] Disable block highlights when settings are showed [MAILPOET-1974] --- assets/js/src/newsletter_editor/App.js | 4 ++++ .../newsletter_editor/behaviors/HighlightEditingBehavior.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/assets/js/src/newsletter_editor/App.js b/assets/js/src/newsletter_editor/App.js index bea3c33223..d9a5e9fbba 100644 --- a/assets/js/src/newsletter_editor/App.js +++ b/assets/js/src/newsletter_editor/App.js @@ -31,6 +31,10 @@ var EditorApplication = Marionette.Application.extend({ return Radio.channel(channel); }, + getShowedSettingsId: function getShowedSettingsId() { + return this.showedSettingsId; + }, + setShowedSettingsId: function setShowedSettingsId(id) { this.showedSettingsId = id; }, diff --git a/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js b/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js index e3dead0d66..1aeb4d2b10 100644 --- a/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js +++ b/assets/js/src/newsletter_editor/behaviors/HighlightEditingBehavior.js @@ -5,6 +5,7 @@ */ import Marionette from 'backbone.marionette'; import BL from 'newsletter_editor/behaviors/BehaviorsLookup'; +import App from 'newsletter_editor/App'; import { isEventInsideElement } from 'newsletter_editor/utils'; BL.HighlightEditingBehavior = Marionette.Behavior.extend({ @@ -24,6 +25,10 @@ BL.HighlightEditingBehavior = Marionette.Behavior.extend({ if (mouseEvent && mouseEvent.buttons > 0) { return; } + // Ignore mouse events when settings panel is showed + if (App.getShowedSettingsId()) { + return; + } this.view.addHighlight(); }, onMouseLeave: function onMouseLeave() {