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

fix Bug 32641 - Окно печати вызывается через раз

Browse source
This commit is contained in:
konovalovsergey 2016-06-09 13:22:58 +03:00
parent 7a5d025854
commit de3250c53a
6 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -280,6 +280,10 @@ var ApplicationController = new(function(){
} }
function onPrintUrl(url) { function onPrintUrl(url) {
if (iframePrint) {
iframePrint.parentNode.removeChild(iframePrint);
iframePrint = null;
}
if (!iframePrint) { if (!iframePrint) {
iframePrint = document.createElement("iframe"); iframePrint = document.createElement("iframe");
iframePrint.id = "id-print-frame"; iframePrint.id = "id-print-frame";
@ -292,6 +296,8 @@ var ApplicationController = new(function(){
iframePrint.onload = function() { iframePrint.onload = function() {
iframePrint.contentWindow.focus(); iframePrint.contentWindow.focus();
iframePrint.contentWindow.print(); iframePrint.contentWindow.print();
iframePrint.contentWindow.blur();
window.focus();
}; };
} }
if (url) iframePrint.src = url; if (url) iframePrint.src = url;

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

@ -1676,6 +1676,10 @@ define([
}, },
onPrintUrl: function(url) { onPrintUrl: function(url) {
if (this.iframePrint) {
this.iframePrint.parentNode.removeChild(this.iframePrint);
this.iframePrint = null;
}
if (!this.iframePrint) { if (!this.iframePrint) {
var me = this; var me = this;
this.iframePrint = document.createElement("iframe"); this.iframePrint = document.createElement("iframe");
@ -1689,6 +1693,8 @@ define([
this.iframePrint.onload = function() { this.iframePrint.onload = function() {
me.iframePrint.contentWindow.focus(); me.iframePrint.contentWindow.focus();
me.iframePrint.contentWindow.print(); me.iframePrint.contentWindow.print();
me.iframePrint.contentWindow.blur();
window.focus();
}; };
} }
if (url) this.iframePrint.src = url; if (url) this.iframePrint.src = url;

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

@ -278,6 +278,10 @@ var ApplicationController = new(function(){
} }
function onPrintUrl(url) { function onPrintUrl(url) {
if (iframePrint) {
iframePrint.parentNode.removeChild(iframePrint);
iframePrint = null;
}
if (!iframePrint) { if (!iframePrint) {
iframePrint = document.createElement("iframe"); iframePrint = document.createElement("iframe");
iframePrint.id = "id-print-frame"; iframePrint.id = "id-print-frame";
@ -290,6 +294,8 @@ var ApplicationController = new(function(){
iframePrint.onload = function() { iframePrint.onload = function() {
iframePrint.contentWindow.focus(); iframePrint.contentWindow.focus();
iframePrint.contentWindow.print(); iframePrint.contentWindow.print();
iframePrint.contentWindow.blur();
window.focus();
}; };
} }
if (url) iframePrint.src = url; if (url) iframePrint.src = url;

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

@ -1453,6 +1453,10 @@ define([
}, },
onPrintUrl: function(url) { onPrintUrl: function(url) {
if (this.iframePrint) {
this.iframePrint.parentNode.removeChild(this.iframePrint);
this.iframePrint = null;
}
if (!this.iframePrint) { if (!this.iframePrint) {
var me = this; var me = this;
this.iframePrint = document.createElement("iframe"); this.iframePrint = document.createElement("iframe");
@ -1466,6 +1470,8 @@ define([
this.iframePrint.onload = function() { this.iframePrint.onload = function() {
me.iframePrint.contentWindow.focus(); me.iframePrint.contentWindow.focus();
me.iframePrint.contentWindow.print(); me.iframePrint.contentWindow.print();
me.iframePrint.contentWindow.blur();
window.focus();
}; };
} }
if (url) this.iframePrint.src = url; if (url) this.iframePrint.src = url;

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

@ -247,6 +247,10 @@ var ApplicationController = new(function(){
} }
function onPrintUrl(url) { function onPrintUrl(url) {
if (iframePrint) {
iframePrint.parentNode.removeChild(iframePrint);
iframePrint = null;
}
if (!iframePrint) { if (!iframePrint) {
iframePrint = document.createElement("iframe"); iframePrint = document.createElement("iframe");
iframePrint.id = "id-print-frame"; iframePrint.id = "id-print-frame";
@ -259,6 +263,8 @@ var ApplicationController = new(function(){
iframePrint.onload = function() { iframePrint.onload = function() {
iframePrint.contentWindow.focus(); iframePrint.contentWindow.focus();
iframePrint.contentWindow.print(); iframePrint.contentWindow.print();
iframePrint.contentWindow.blur();
window.focus();
}; };
} }
if (url) iframePrint.src = url; if (url) iframePrint.src = url;

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

@ -1658,6 +1658,10 @@ define([
}, },
onPrintUrl: function(url) { onPrintUrl: function(url) {
if (this.iframePrint) {
this.iframePrint.parentNode.removeChild(this.iframePrint);
this.iframePrint = null;
}
if (!this.iframePrint) { if (!this.iframePrint) {
var me = this; var me = this;
this.iframePrint = document.createElement("iframe"); this.iframePrint = document.createElement("iframe");
@ -1671,6 +1675,8 @@ define([
this.iframePrint.onload = function() { this.iframePrint.onload = function() {
me.iframePrint.contentWindow.focus(); me.iframePrint.contentWindow.focus();
me.iframePrint.contentWindow.print(); me.iframePrint.contentWindow.print();
me.iframePrint.contentWindow.blur();
window.focus();
}; };
} }
if (url) this.iframePrint.src = url; if (url) this.iframePrint.src = url;