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

Fix Bug 35525. + Set focus to document after "insert table" dialog is closed.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-23 11:02:04 +03:00
parent f0cdbe2860
commit 13b623ef0c
8 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/documenteditor/main/app/controller/Main.js
View file

@ -1306,6 +1306,20 @@ define([
this.api.asc_DownloadAs(); this.api.asc_DownloadAs();
else else
(this.appOptions.canDownload) ? this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas') : this.api.asc_DownloadOrigin(); (this.appOptions.canDownload) ? this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas') : this.api.asc_DownloadOrigin();
} else if (id == Asc.c_oAscError.ID.SplitCellMaxRows || id == Asc.c_oAscError.ID.SplitCellMaxCols || id == Asc.c_oAscError.ID.SplitCellRowsDivider) {
var me = this;
setTimeout(function(){
(new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) {
if (result == 'ok') {
if (me.api)
me.api.SplitCell(value.columns, value.rows);
}
me.onEditComplete();
}
})).show();
},10);
} }
this._state.lostEditingRights = false; this._state.lostEditingRights = false;
this.onEditComplete(); this.onEditComplete();
@ -1760,7 +1774,7 @@ define([
Common.localStorage.setItem("de-settings-showchanges-strict", 'last'); Common.localStorage.setItem("de-settings-showchanges-strict", 'last');
this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.LastChanges); this.api.SetCollaborativeMarksShowType(Asc.c_oAscCollaborativeMarksShowType.LastChanges);
} }
this.fireEvent('editcomplete', this); this.onEditComplete();
}, this) }, this)
}); });
}, },

2
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -1363,9 +1363,9 @@ define([
me.api.put_Table(value.columns, value.rows); me.api.put_Table(value.columns, value.rows);
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Table'); Common.component.Analytics.trackEvent('ToolBar', 'Table');
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} }
})).show(); })).show();
} }

3
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -2314,10 +2314,9 @@ define([
if (me.api) { if (me.api) {
me.api.SplitCell(value.columns, value.rows); me.api.SplitCell(value.columns, value.rows);
} }
me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Table'); Common.component.Analytics.trackEvent('DocumentHolder', 'Table');
} }
me.fireEvent('editcomplete', me);
} }
})).show(); })).show();
} }

2
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -243,8 +243,8 @@ define([
if (me.api) { if (me.api) {
me.api.SplitCell(value.columns, value.rows); me.api.SplitCell(value.columns, value.rows);
} }
me.fireEvent('editcomplete', me);
} }
me.fireEvent('editcomplete', me);
} }
})).show(); })).show();
}, },

14
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1061,6 +1061,20 @@ define([
if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) { if (id == Asc.c_oAscError.ID.Warning && btn == 'ok' && this.appOptions.canDownload) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
(this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas'); (this.appOptions.isDesktopApp && this.appOptions.isOffline) ? this.api.asc_DownloadAs() : this.getApplication().getController('LeftMenu').leftMenu.showMenu('file:saveas');
} else if (id == Asc.c_oAscError.ID.SplitCellMaxRows || id == Asc.c_oAscError.ID.SplitCellMaxCols || id == Asc.c_oAscError.ID.SplitCellRowsDivider) {
var me = this;
setTimeout(function(){
(new Common.Views.InsertTableDialog({
split: true,
handler: function(result, value) {
if (result == 'ok') {
if (me.api)
me.api.SplitCell(value.columns, value.rows);
}
me.onEditComplete();
}
})).show();
},10);
} }
this._state.lostEditingRights = false; this._state.lostEditingRights = false;
this.onEditComplete(); this.onEditComplete();

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -1328,9 +1328,9 @@ define([
me.api.put_Table(value.columns, value.rows); me.api.put_Table(value.columns, value.rows);
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Table'); Common.component.Analytics.trackEvent('ToolBar', 'Table');
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
} }
})).show(); })).show();
} }

2
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -1981,9 +1981,9 @@ define([
if (me.api) { if (me.api) {
me.api.SplitCell(value.columns, value.rows); me.api.SplitCell(value.columns, value.rows);
} }
me.fireEvent('editcomplete', me);
Common.component.Analytics.trackEvent('DocumentHolder', 'Table Split'); Common.component.Analytics.trackEvent('DocumentHolder', 'Table Split');
} }
me.fireEvent('editcomplete', me);
} }
})).show(); })).show();
} }

2
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -209,8 +209,8 @@ define([
if (me.api) { if (me.api) {
me.api.SplitCell(value.columns, value.rows); me.api.SplitCell(value.columns, value.rows);
} }
me.fireEvent('editcomplete', me);
} }
me.fireEvent('editcomplete', me);
} }
})).show(); })).show();
}, },