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
b37e1127
Commit
b37e1127
authored
Dec 02, 2016
by
Oleg Korshul
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zoom bug
parent
433732a3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
47 additions
and
21 deletions
+47
-21
apps/common/main/lib/util/utils.js
apps/common/main/lib/util/utils.js
+47
-21
No files found.
apps/common/main/lib/util/utils.js
View file @
b37e1127
...
...
@@ -104,8 +104,11 @@ Common.Utils = _.extend(new(function() {
},
me
=
this
,
checkSize
=
function
()
{
if
(
isChrome
&&
!
isOpera
&&
document
&&
document
.
firstElementChild
&&
document
.
body
)
{
//document.firstElementChild.style.zoom = "reset";
me
.
zoom
=
1
;
if
(
false
)
{
// этот код - рабочий, но только если этот ифрейм открыт на весь размер браузера
// (window.outerWidth и window.innerWidth зависимы)
if
(
window
.
innerWidth
>
300
)
me
.
zoom
=
window
.
outerWidth
/
window
.
innerWidth
;
...
...
@@ -118,13 +121,36 @@ Common.Utils = _.extend(new(function() {
// device pixel ratio: кратно 0.5
_devicePixelRatio
=
(
5
*
(((
2.5
+
10
*
_devicePixelRatio
)
/
5
)
>>
0
))
/
10
;
me
.
zoom
=
window
.
devicePixelRatio
/
_devicePixelRatio
;
// chrome 54.x: zoom = "reset" - clear retina zoom (windows)
//document.firstElementChild.style.zoom = "reset";
document
.
firstElementChild
.
style
.
zoom
=
1.0
/
me
.
zoom
;
}
else
{
// делаем простую проверку
// считаем: 0 < window.devicePixelRatio < 2 => _devicePixelRatio = 1; zoom = window.devicePixelRatio / _devicePixelRatio;
// считаем: window.devicePixelRatio >= 2 => _devicePixelRatio = 2; zoom = window.devicePixelRatio / _devicePixelRatio;
if
(
window
.
devicePixelRatio
>
0.1
)
{
if
(
window
.
devicePixelRatio
<
1.99
)
{
var
_devicePixelRatio
=
1
;
me
.
zoom
=
window
.
devicePixelRatio
/
_devicePixelRatio
;
}
else
{
var
_devicePixelRatio
=
2
;
me
.
zoom
=
window
.
devicePixelRatio
/
_devicePixelRatio
;
}
// chrome 54.x: zoom = "reset" - clear retina zoom (windows)
//document.firstElementChild.style.zoom = "reset";
document
.
firstElementChild
.
style
.
zoom
=
1.0
/
me
.
zoom
;
}
else
document
.
firstElementChild
.
style
.
zoom
=
"
normal
"
;
}
me
.
innerWidth
=
window
.
innerWidth
*
me
.
zoom
;
me
.
innerHeight
=
window
.
innerHeight
*
me
.
zoom
;
};
...
...
Boris Kocherov
@bk
mentioned in commit
d6011c15
·
May 29, 2017
mentioned in commit
d6011c15
mentioned in commit d6011c15c4d6dd27281b5c1a1284c1ce2dd04683
Toggle commit list
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