From 14bd0891461f3bb207c3f0a366322bfa3835ecce Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 28 May 2019 16:34:57 +0300 Subject: [PATCH] [SSE] Don't listen change selection events when modal dialog is visible --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index a7fa88538..3a15b8e88 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1665,6 +1665,8 @@ define([ }, onApiEditCell: function(state) { + if (this.getApplication().getController('Main').isModalShowed) return; + var toolbar = this.toolbar; if (toolbar.mode.isEditDiagram || toolbar.mode.isEditMailMerge) { is_cell_edited = (state == Asc.c_oAscCellEditorState.editStart); @@ -1800,7 +1802,7 @@ define([ }, onApiEditorSelectionChanged: function(fontobj) { - if (!this.editMode) return; + if (!this.editMode || this.getApplication().getController('Main').isModalShowed) return; var toolbar = this.toolbar, val; @@ -1906,7 +1908,7 @@ define([ }, onApiSelectionChanged: function(info) { - if (!this.editMode) return; + if (!this.editMode || this.getApplication().getController('Main').isModalShowed) return; if ( this.toolbar.mode.isEditDiagram ) return this.onApiSelectionChanged_DiagramEditor(info); else if ( this.toolbar.mode.isEditMailMerge ) @@ -3322,10 +3324,6 @@ define([ api: me.api, fontStore: me.fontStore, handler: function(dlg, result) { - if (result == 'ok') { - var props = dlg.getSettings(); - // me.api.asc_editHeader(props); - } Common.NotificationCenter.trigger('edit:complete'); } });