Commit f5aa4fb2 authored by konovalovsergey's avatar konovalovsergey

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

parent f54a94ce
...@@ -272,6 +272,10 @@ var ApplicationController = new(function(){ ...@@ -272,6 +272,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";
...@@ -284,6 +288,8 @@ var ApplicationController = new(function(){ ...@@ -284,6 +288,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;
......
...@@ -1668,6 +1668,10 @@ define([ ...@@ -1668,6 +1668,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");
...@@ -1681,6 +1685,8 @@ define([ ...@@ -1681,6 +1685,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;
......
...@@ -270,6 +270,10 @@ var ApplicationController = new(function(){ ...@@ -270,6 +270,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";
...@@ -282,6 +286,8 @@ var ApplicationController = new(function(){ ...@@ -282,6 +286,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;
......
...@@ -1445,6 +1445,10 @@ define([ ...@@ -1445,6 +1445,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");
...@@ -1458,6 +1462,8 @@ define([ ...@@ -1458,6 +1462,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;
......
...@@ -239,6 +239,10 @@ var ApplicationController = new(function(){ ...@@ -239,6 +239,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";
...@@ -251,6 +255,8 @@ var ApplicationController = new(function(){ ...@@ -251,6 +255,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;
......
...@@ -1650,6 +1650,10 @@ define([ ...@@ -1650,6 +1650,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");
...@@ -1663,6 +1667,8 @@ define([ ...@@ -1663,6 +1667,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment