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

[SSE] Fix Bug 46338

Browse source
This commit is contained in:
Julia Radzhabova 2020-09-08 15:48:05 +03:00
parent d9c5b29953
commit a298d8f28b
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View file

@ -111,10 +111,12 @@ define([
if (settings.api) { if (settings.api) {
me.api = settings.api; me.api = settings.api;
me.wrapEvents = {
onApiRangeChanged: _.bind(me.onApiRangeChanged, me)
};
me.api.asc_setSelectionDialogMode(settings.type, settings.range ? settings.range : ''); me.api.asc_setSelectionDialogMode(settings.type, settings.range ? settings.range : '');
me.api.asc_unregisterCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); me.api.asc_registerCallback('asc_onSelectionRangeChanged', me.wrapEvents.onApiRangeChanged);
me.api.asc_registerCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me));
Common.NotificationCenter.trigger('cells:range', settings.type); Common.NotificationCenter.trigger('cells:range', settings.type);
} }
@ -177,8 +179,10 @@ define([
}, },
onClose: function(event) { onClose: function(event) {
if (this.api) if (this.api) {
this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None);
this.api.asc_unregisterCallback('asc_onSelectionRangeChanged', this.wrapEvents.onApiRangeChanged);
}
Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None); Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None);
SSE.getController('RightMenu').SetDisabled(false); SSE.getController('RightMenu').SetDisabled(false);

10
apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js
View file

@ -133,8 +133,10 @@ define([
if (settings.selectionType) if (settings.selectionType)
me.selectionType = settings.selectionType; me.selectionType = settings.selectionType;
me.api.asc_unregisterCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); me.wrapEvents = {
me.api.asc_registerCallback('asc_onSelectionRangeChanged', _.bind(me.onApiRangeChanged, me)); onApiRangeChanged: _.bind(me.onApiRangeChanged, me)
};
me.api.asc_registerCallback('asc_onSelectionRangeChanged', me.wrapEvents.onApiRangeChanged);
Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.FormatTable); Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.FormatTable);
} }
@ -190,8 +192,10 @@ define([
}, },
onClose: function(event) { onClose: function(event) {
if (this.api) if (this.api) {
this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None); this.api.asc_setSelectionDialogMode(Asc.c_oAscSelectionDialogType.None);
this.api.asc_unregisterCallback('asc_onSelectionRangeChanged', this.wrapEvents.onApiRangeChanged);
}
Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None); Common.NotificationCenter.trigger('cells:range', Asc.c_oAscSelectionDialogType.None);
Common.NotificationCenter.trigger('edit:complete', this); Common.NotificationCenter.trigger('edit:complete', this);