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

Change usage of asc_Print

Browse source
This commit is contained in:
Julia Radzhabova 2019-07-24 16:07:16 +03:00
parent b0d6c172b9
commit 39bfe54860
10 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -204,7 +204,7 @@ DE.ApplicationController = new(function(){
function onPrint() { function onPrint() {
if ( permissions.print!==false ) if ( permissions.print!==false )
api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
} }
function onPrintUrl(url) { function onPrintUrl(url) {
@ -259,7 +259,7 @@ DE.ApplicationController = new(function(){
common.utils.openLink(embedConfig.saveUrl); common.utils.openLink(embedConfig.saveUrl);
} else } else
if (api && permissions.print!==false){ if (api && permissions.print!==false){
api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
} }
Common.Analytics.trackEvent('Save'); Common.Analytics.trackEvent('Save');

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

@ -237,7 +237,7 @@ define([
if ( isopts ) close_menu = false; if ( isopts ) close_menu = false;
else this.clickSaveCopyAsFormat(undefined); else this.clickSaveCopyAsFormat(undefined);
break; break;
case 'print': this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break; case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break;
case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'exit': Common.NotificationCenter.trigger('goback'); break;
case 'edit': case 'edit':
this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText);

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

@ -2073,7 +2073,7 @@ define([
if (!this.appOptions.canPrint || this.isModalShowed) return; if (!this.appOptions.canPrint || this.isModalShowed) return;
if (this.api) if (this.api)
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
Common.component.Analytics.trackEvent('Print'); Common.component.Analytics.trackEvent('Print');
}, },

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

@ -966,7 +966,7 @@ define([
onPrint: function(e) { onPrint: function(e) {
if (this.api) if (this.api)
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);

4
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -201,7 +201,7 @@ PE.ApplicationController = new(function(){
function onPrint() { function onPrint() {
if (permissions.print!==false) if (permissions.print!==false)
api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
} }
function onPrintUrl(url) { function onPrintUrl(url) {
@ -267,7 +267,7 @@ PE.ApplicationController = new(function(){
common.utils.openLink(embedConfig.saveUrl); common.utils.openLink(embedConfig.saveUrl);
} else } else
if (api && permissions.print!==false){ if (api && permissions.print!==false){
api.asc_Print($.browser.chrome || $.browser.safari || $.browser.opera); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
} }
Common.Analytics.trackEvent('Save'); Common.Analytics.trackEvent('Save');

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

@ -215,7 +215,7 @@ define([
case 'back': break; case 'back': break;
case 'save': this.api.asc_Save(); break; case 'save': this.api.asc_Save(); break;
case 'save-desktop': this.api.asc_DownloadAs(); break; case 'save-desktop': this.api.asc_DownloadAs(); break;
case 'print': this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); break; case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break;
case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'exit': Common.NotificationCenter.trigger('goback'); break;
case 'edit': case 'edit':
this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText);

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

@ -1758,7 +1758,7 @@ define([
if (!this.appOptions.canPrint || this.isModalShowed) return; if (!this.appOptions.canPrint || this.isModalShowed) return;
if (this.api) if (this.api)
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
Common.component.Analytics.trackEvent('Print'); Common.component.Analytics.trackEvent('Print');
}, },

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

@ -893,7 +893,7 @@ define([
onPrint: function(e) { onPrint: function(e) {
if (this.api) if (this.api)
this.api.asc_Print(Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);

4
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -156,7 +156,7 @@ SSE.ApplicationController = new(function(){
function onPrint() { function onPrint() {
if ( permissions.print!==false ) if ( permissions.print!==false )
api.asc_Print(undefined, $.browser.chrome || $.browser.safari || $.browser.opera); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
} }
function onPrintUrl(url) { function onPrintUrl(url) {
@ -204,7 +204,7 @@ SSE.ApplicationController = new(function(){
common.utils.openLink(embedConfig.saveUrl); common.utils.openLink(embedConfig.saveUrl);
} else } else
if (permissions.print!==false){ if (permissions.print!==false){
api.asc_Print(undefined, $.browser.chrome || $.browser.safari || $.browser.opera); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera));
} }
Common.Analytics.trackEvent('Save'); Common.Analytics.trackEvent('Save');

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

@ -266,9 +266,11 @@ define([
this.adjPrintParams.asc_setIgnorePrintArea(this.printSettingsDlg.getIgnorePrintArea()); this.adjPrintParams.asc_setIgnorePrintArea(this.printSettingsDlg.getIgnorePrintArea());
Common.localStorage.setItem("sse-print-settings-range", printtype); Common.localStorage.setItem("sse-print-settings-range", printtype);
if ( this.printSettingsDlg.type=='print' ) if ( this.printSettingsDlg.type=='print' ) {
this.api.asc_Print(this.adjPrintParams, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera);
else { opts.asc_setAdjustPrint(this.adjPrintParams);
this.api.asc_Print(opts);
} else {
var opts = new Asc.asc_CDownloadOptions(this.downloadFormat, this.asUrl); var opts = new Asc.asc_CDownloadOptions(this.downloadFormat, this.asUrl);
opts.asc_setAdjustPrint(this.adjPrintParams); opts.asc_setAdjustPrint(this.adjPrintParams);
this.api.asc_DownloadAs(opts); this.api.asc_DownloadAs(opts);