Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
f5aa4fb2
Commit
f5aa4fb2
authored
Jun 09, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Bug 32641 - Окно печати вызывается через раз
parent
f54a94ce
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
0 deletions
+36
-0
apps/documenteditor/embed/js/ApplicationController.js
apps/documenteditor/embed/js/ApplicationController.js
+6
-0
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+6
-0
apps/presentationeditor/embed/js/ApplicationController.js
apps/presentationeditor/embed/js/ApplicationController.js
+6
-0
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+6
-0
apps/spreadsheeteditor/embed/js/ApplicationController.js
apps/spreadsheeteditor/embed/js/ApplicationController.js
+6
-0
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+6
-0
No files found.
apps/documenteditor/embed/js/ApplicationController.js
View file @
f5aa4fb2
...
@@ -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
;
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
f5aa4fb2
...
@@ -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
;
...
...
apps/presentationeditor/embed/js/ApplicationController.js
View file @
f5aa4fb2
...
@@ -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
;
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
f5aa4fb2
...
@@ -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
;
...
...
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file @
f5aa4fb2
...
@@ -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
;
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
f5aa4fb2
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment