Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix rev. 14bd089146: "Don't listen change selection events when modal dialog is visible"

Browse source
This commit is contained in:
Julia Radzhabova 2019-06-06 11:27:17 +03:00
parent 2303266c74
commit 3d61c73aa2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1662,7 +1662,7 @@ define([
}, },
onApiEditCell: function(state) { onApiEditCell: function(state) {
if (this.getApplication().getController('Main').isModalShowed) return; if ($('.asc-window.enable-key-events:visible').length>0) return;
var toolbar = this.toolbar; var toolbar = this.toolbar;
if (toolbar.mode.isEditDiagram || toolbar.mode.isEditMailMerge) { if (toolbar.mode.isEditDiagram || toolbar.mode.isEditMailMerge) {
@ -1798,7 +1798,7 @@ define([
}, },
onApiEditorSelectionChanged: function(fontobj) { onApiEditorSelectionChanged: function(fontobj) {
if (!this.editMode || this.getApplication().getController('Main').isModalShowed) return; if (!this.editMode || $('.asc-window.enable-key-events:visible').length>0) return;
var toolbar = this.toolbar, var toolbar = this.toolbar,
val; val;
@ -1904,7 +1904,7 @@ define([
}, },
onApiSelectionChanged: function(info) { onApiSelectionChanged: function(info) {
if (!this.editMode || this.getApplication().getController('Main').isModalShowed) return; if (!this.editMode || $('.asc-window.enable-key-events:visible').length>0) return;
if ( this.toolbar.mode.isEditDiagram ) if ( this.toolbar.mode.isEditDiagram )
return this.onApiSelectionChanged_DiagramEditor(info); else return this.onApiSelectionChanged_DiagramEditor(info); else
if ( this.toolbar.mode.isEditMailMerge ) if ( this.toolbar.mode.isEditMailMerge )