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

For Bug 23603, Bug 32790 (add to rev. 470a0483bb)

Browse source
This commit is contained in:
Julia Radzhabova 2019-01-10 14:00:30 +03:00
parent 04bd8e2c62
commit 04bf403d3b
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -383,6 +383,7 @@ define([
}, },
onDownloadAs: function(format) { onDownloadAs: function(format) {
this._state.isFromGatewayDownloadAs = true;
var _format = (format && (typeof format == 'string')) ? Asc.c_oAscFileType[ format.toUpperCase() ] : null, var _format = (format && (typeof format == 'string')) ? Asc.c_oAscFileType[ format.toUpperCase() ] : null,
_supported = [ _supported = [
Asc.c_oAscFileType.PPTX, Asc.c_oAscFileType.PPTX,
@ -1391,7 +1392,9 @@ define([
}, },
onDownloadUrl: function(url) { onDownloadUrl: function(url) {
Common.Gateway.downloadAs(url); if (this._state.isFromGatewayDownloadAs)
Common.Gateway.downloadAs(url);
this._state.isFromGatewayDownloadAs = false;
}, },
onUpdateVersion: function(callback) { onUpdateVersion: function(callback) {

5
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -144,6 +144,7 @@ define([
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this));
this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this)); this.api.asc_registerCallback('asc_onDownloadUrl', _.bind(this.onDownloadUrl, this));
Common.NotificationCenter.on('download:cancel', _.bind(this.onDownloadCancel, this));
/** coauthoring begin **/ /** coauthoring begin **/
if (this.mode.canCoAuthoring) { if (this.mode.canCoAuthoring) {
if (this.mode.canChat) if (this.mode.canChat)
@ -338,6 +339,10 @@ define([
this.isFromFileDownloadAs = false; this.isFromFileDownloadAs = false;
}, },
onDownloadCancel: function() {
this.isFromFileDownloadAs = false;
},
applySettings: function(menu) { applySettings: function(menu) {
var value = Common.localStorage.getItem("sse-settings-fontrender"); var value = Common.localStorage.getItem("sse-settings-fontrender");
Common.Utils.InternalSettings.set("sse-settings-fontrender", value); Common.Utils.InternalSettings.set("sse-settings-fontrender", value);

10
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -168,6 +168,7 @@ define([
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this)); Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
Common.NotificationCenter.on('namedrange:locked', _.bind(this.onNamedRangeLocked, this)); Common.NotificationCenter.on('namedrange:locked', _.bind(this.onNamedRangeLocked, this));
Common.NotificationCenter.on('download:cancel', _.bind(this.onDownloadCancel, this));
this.stackLongActions = new Common.IrregularStack({ this.stackLongActions = new Common.IrregularStack({
strongCompare : this._compareActionStrong, strongCompare : this._compareActionStrong,
@ -408,6 +409,7 @@ define([
}, },
onDownloadAs: function(format) { onDownloadAs: function(format) {
this._state.isFromGatewayDownloadAs = true;
var _format = (format && (typeof format == 'string')) ? Asc.c_oAscFileType[ format.toUpperCase() ] : null, var _format = (format && (typeof format == 'string')) ? Asc.c_oAscFileType[ format.toUpperCase() ] : null,
_supported = [ _supported = [
Asc.c_oAscFileType.XLSX, Asc.c_oAscFileType.XLSX,
@ -1526,7 +1528,13 @@ define([
}, },
onDownloadUrl: function(url) { onDownloadUrl: function(url) {
Common.Gateway.downloadAs(url); if (this._state.isFromGatewayDownloadAs)
Common.Gateway.downloadAs(url);
this._state.isFromGatewayDownloadAs = false;
},
onDownloadCancel: function() {
this._state.isFromGatewayDownloadAs = false;
}, },
onUpdateVersion: function(callback) { onUpdateVersion: function(callback) {

10
apps/spreadsheeteditor/main/app/controller/Print.js
View file

@ -227,7 +227,11 @@ define([
}, },
openPrintSettings: function(type, cmp, format, asUrl) { openPrintSettings: function(type, cmp, format, asUrl) {
if (this.printSettingsDlg && this.printSettingsDlg.isVisible()) return; if (this.printSettingsDlg && this.printSettingsDlg.isVisible()) {
asUrl && Common.NotificationCenter.trigger('download:cancel');
return;
}
if (this.api) { if (this.api) {
this.asUrl = asUrl; this.asUrl = asUrl;
this.downloadFormat = format; this.downloadFormat = format;
@ -266,8 +270,10 @@ define([
Common.NotificationCenter.trigger('edit:complete', view); Common.NotificationCenter.trigger('edit:complete', view);
} else } else
return true; return true;
} else } else {
this.asUrl && Common.NotificationCenter.trigger('download:cancel');
Common.NotificationCenter.trigger('edit:complete', view); Common.NotificationCenter.trigger('edit:complete', view);
}
this.printSettingsDlg = null; this.printSettingsDlg = null;
}, },