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

Merge pull request #588 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2020-11-24 12:31:05 +03:00 committed by GitHub
parent 0083bb3347 092e0c34b4
commit c7d8aec49e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/presentationeditor/mobile/app/controller/Settings.js
View file

@ -358,9 +358,9 @@ define([
_onPrint: function(e) { _onPrint: function(e) {
var me = this; var me = this;
_.defer(function () { _.delay(function () {
me.api.asc_Print(); me.api.asc_Print();
}); }, 300);
me.hideModal(); me.hideModal();
}, },
@ -393,9 +393,9 @@ define([
format = $(e.currentTarget).data('format'); format = $(e.currentTarget).data('format');
if (format) { if (format) {
_.defer(function () { _.delay(function () {
me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}); }, 300);
} }
me.hideModal(); me.hideModal();

14
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View file

@ -528,11 +528,15 @@ define([
}, },
onSwitch: function() { onSwitch: function() {
this.chartSettings.switchRowCol(); var res = this.chartSettings.switchRowCol();
this.updateSeriesList(this.chartSettings.getSeries(), 0); if (res === Asc.c_oAscError.ID.MaxDataSeriesError)
this.updateCategoryList(this.chartSettings.getCatValues()); Common.UI.warning({msg: this.errorMaxRows, maxwidth: 600});
this.updateRange(); else {
this.updateButtons(); this.updateSeriesList(this.chartSettings.getSeries(), 0);
this.updateCategoryList(this.chartSettings.getCatValues());
this.updateRange();
this.updateButtons();
}
}, },
textTitle: 'Chart Data', textTitle: 'Chart Data',

8
apps/spreadsheeteditor/mobile/app/controller/Settings.js
View file

@ -675,9 +675,9 @@ define([
_onPrint: function(e) { _onPrint: function(e) {
var me = this; var me = this;
_.defer(function () { _.delay(function () {
me.api.asc_Print(); me.api.asc_Print();
}); }, 300);
me.hideModal(); me.hideModal();
}, },
@ -699,9 +699,9 @@ define([
); );
}, 50); }, 50);
} else { } else {
setTimeout(function () { _.delay(function () {
me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); me.api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format));
}, 50); }, 300);
} }
} }
}, },