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

[SSE] Fix validation list

Browse source
This commit is contained in:
Julia Radzhabova 2020-03-16 15:06:56 +03:00
parent 1c39acf0e8
commit 97fe427078
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -303,8 +303,8 @@ define([
this.api.asc_registerCallback('asc_onSetAFDialog', _.bind(this.onApiAutofilter, this)); this.api.asc_registerCallback('asc_onSetAFDialog', _.bind(this.onApiAutofilter, this));
this.api.asc_registerCallback('asc_onEditCell', _.bind(this.onApiEditCell, this)); this.api.asc_registerCallback('asc_onEditCell', _.bind(this.onApiEditCell, this));
this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this)); this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this));
this.api.asc_registerCallback('asc_onEntriesListMenu', _.bind(this.onEntriesListMenu, this, true)); // Alt + Down this.api.asc_registerCallback('asc_onEntriesListMenu', _.bind(this.onEntriesListMenu, this, false)); // Alt + Down
this.api.asc_registerCallback('asc_onValidationListMenu', _.bind(this.onEntriesListMenu, this, false)); this.api.asc_registerCallback('asc_onValidationListMenu', _.bind(this.onEntriesListMenu, this, true));
this.api.asc_registerCallback('asc_onFormulaCompleteMenu', _.bind(this.onFormulaCompleteMenu, this)); this.api.asc_registerCallback('asc_onFormulaCompleteMenu', _.bind(this.onFormulaCompleteMenu, this));
this.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(this.onShowSpecialPasteOptions, this)); this.api.asc_registerCallback('asc_onShowSpecialPasteOptions', _.bind(this.onShowSpecialPasteOptions, this));
this.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(this.onHideSpecialPasteOptions, this)); this.api.asc_registerCallback('asc_onHideSpecialPasteOptions', _.bind(this.onHideSpecialPasteOptions, this));
@ -1944,13 +1944,18 @@ define([
} }
}, },
onEntriesListMenu: function(warning, textarr) { onEntriesListMenu: function(validation, textarr) {
if (textarr && textarr.length>0) { if (textarr && textarr.length>0) {
var me = this, var me = this,
documentHolderView = me.documentHolder, documentHolderView = me.documentHolder,
menu = documentHolderView.entriesMenu, menu = documentHolderView.entriesMenu,
menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)); menuContainer = documentHolderView.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id));
if (validation && menu.isVisible()) {
menu.hide();
return;
}
for (var i = 0; i < menu.items.length; i++) { for (var i = 0; i < menu.items.length; i++) {
menu.removeItem(menu.items[i]); menu.removeItem(menu.items[i]);
i--; i--;
@ -1991,7 +1996,7 @@ define([
}, 10); }, 10);
} else { } else {
this.documentHolder.entriesMenu.hide(); this.documentHolder.entriesMenu.hide();
warning && Common.UI.warning({ !validation && Common.UI.warning({
title: this.notcriticalErrorTitle, title: this.notcriticalErrorTitle,
maxwidth: 600, maxwidth: 600,
msg : this.txtNoChoices, msg : this.txtNoChoices,