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

Merge pull request #821 from ONLYOFFICE/fix/print

Browse source 
Fix Bug 34613
This commit is contained in:
Julia Radzhabova 2021-04-20 18:50:38 +03:00 committed by GitHub
parent b90fecb84c 67499c5d21
commit aacb8dcfab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,7 +213,7 @@ DE.ApplicationController = new(function(){
function onPrint() { function onPrint() {
if ( permissions.print!==false ) if ( permissions.print!==false )
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
} }
function onPrintUrl(url) { function onPrintUrl(url) {
@ -277,7 +277,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(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
} }
Common.Analytics.trackEvent('Save'); Common.Analytics.trackEvent('Save');
@ -285,7 +285,7 @@ DE.ApplicationController = new(function(){
DE.ApplicationView.tools.get('#idt-print') DE.ApplicationView.tools.get('#idt-print')
.on('click', function(){ .on('click', function(){
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
Common.Analytics.trackEvent('Print'); Common.Analytics.trackEvent('Print');
}); });

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

@ -236,7 +236,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(new Asc.asc_CDownloadOptions(null, 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 || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); 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

@ -2278,7 +2278,7 @@ define([
if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return; if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return;
if (this.api) if (this.api)
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 this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // 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

@ -1055,7 +1055,7 @@ define([
onPrint: function(e) { onPrint: function(e) {
if (this.api) if (this.api)
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 this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // 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);

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

@ -1857,7 +1857,7 @@ define([
if (this.api){ if (this.api){
var printopt = new Asc.asc_CAdjustPrint(); var printopt = new Asc.asc_CAdjustPrint();
printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection);
var opts = 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 var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
opts.asc_setAdvancedOptions(printopt); opts.asc_setAdvancedOptions(printopt);
this.api.asc_Print(opts); this.api.asc_Print(opts);
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);

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

@ -210,7 +210,7 @@ PE.ApplicationController = new(function(){
function onPrint() { function onPrint() {
if (permissions.print!==false) if (permissions.print!==false)
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
} }
function onPrintUrl(url) { function onPrintUrl(url) {
@ -285,7 +285,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(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
} }
Common.Analytics.trackEvent('Save'); Common.Analytics.trackEvent('Save');
@ -293,7 +293,7 @@ PE.ApplicationController = new(function(){
PE.ApplicationView.tools.get('#idt-print') PE.ApplicationView.tools.get('#idt-print')
.on('click', function(){ .on('click', function(){
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
Common.Analytics.trackEvent('Print'); Common.Analytics.trackEvent('Print');
}); });

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

@ -214,7 +214,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(new Asc.asc_CDownloadOptions(null, 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 || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); 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

@ -1918,7 +1918,7 @@ define([
if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return; if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return;
if (this.api) if (this.api)
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 this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // 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

@ -953,7 +953,7 @@ define([
onPrint: function(e) { onPrint: function(e) {
if (this.api) if (this.api)
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 this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // 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/main/app/view/DocumentHolder.js
View file

@ -1856,7 +1856,7 @@ define([
if (me.api){ if (me.api){
var printopt = new Asc.asc_CAdjustPrint(); var printopt = new Asc.asc_CAdjustPrint();
printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection);
var opts = 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 var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
opts.asc_setAdvancedOptions(printopt); opts.asc_setAdvancedOptions(printopt);
me.api.asc_Print(opts); me.api.asc_Print(opts);
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);
@ -1962,7 +1962,7 @@ define([
if (me.api){ if (me.api){
var printopt = new Asc.asc_CAdjustPrint(); var printopt = new Asc.asc_CAdjustPrint();
printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection);
var opts = 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 var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event
opts.asc_setAdvancedOptions(printopt); opts.asc_setAdvancedOptions(printopt);
me.api.asc_Print(opts); me.api.asc_Print(opts);
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);

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

@ -165,7 +165,7 @@ SSE.ApplicationController = new(function(){
function onPrint() { function onPrint() {
if ( permissions.print!==false ) if ( permissions.print!==false )
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
} }
function onPrintUrl(url) { function onPrintUrl(url) {
@ -222,7 +222,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(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
} }
Common.Analytics.trackEvent('Save'); Common.Analytics.trackEvent('Save');
@ -230,7 +230,7 @@ SSE.ApplicationController = new(function(){
SSE.ApplicationView.tools.get('#idt-print') SSE.ApplicationView.tools.get('#idt-print')
.on('click', function(){ .on('click', function(){
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
Common.Analytics.trackEvent('Print'); Common.Analytics.trackEvent('Print');
}); });

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

@ -310,7 +310,7 @@ define([
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' ) {
var opts = new Asc.asc_CDownloadOptions(null, 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 || Common.Utils.isGecko && Common.Utils.firefoxVersion>86);
opts.asc_setAdvancedOptions(this.adjPrintParams); opts.asc_setAdvancedOptions(this.adjPrintParams);
this.api.asc_Print(opts); this.api.asc_Print(opts);
} else { } else {