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

Remove zoom correction on mobile devices.

Browse source
This commit is contained in:
Julia Radzhabova 2016-12-07 13:54:26 +03:00
parent dd7ecf814f
commit bad28bbe33
1 changed files with 23 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
apps/common/main/lib/util/utils.js
View file

@ -102,57 +102,33 @@ Common.Utils = _.extend(new(function() {
Chart : 7, Chart : 7,
MailMerge : 8 MailMerge : 8
}, },
isMobile = /android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(navigator.userAgent || navigator.vendor || window.opera),
me = this, me = this,
checkSize = function() { checkSize = function() {
me.zoom = 1; me.zoom = 1;
if (isChrome && !isOpera && document && document.firstElementChild && document.body) if (isChrome && !isOpera && !isMobile && document && document.firstElementChild && document.body)
{ {
if (false) // делаем простую проверку
{ // считаем: 0 < window.devicePixelRatio < 2 => _devicePixelRatio = 1; zoom = window.devicePixelRatio / _devicePixelRatio;
// этот код - рабочий, но только если этот ифрейм открыт на весь размер браузера // считаем: window.devicePixelRatio >= 2 => _devicePixelRatio = 2; zoom = window.devicePixelRatio / _devicePixelRatio;
// (window.outerWidth и window.innerWidth зависимы) if (window.devicePixelRatio > 0.1)
if (window.innerWidth > 300) {
me.zoom = window.outerWidth / window.innerWidth; if (window.devicePixelRatio < 1.99)
{
if (Math.abs(me.zoom - 1) < 0.1) var _devicePixelRatio = 1;
me.zoom = 1; me.zoom = window.devicePixelRatio / _devicePixelRatio;
}
me.zoom = window.outerWidth / window.innerWidth; else
{
var _devicePixelRatio = window.devicePixelRatio / me.zoom; var _devicePixelRatio = 2;
me.zoom = window.devicePixelRatio / _devicePixelRatio;
// device pixel ratio: кратно 0.5 }
_devicePixelRatio = (5 * (((2.5 + 10 * _devicePixelRatio) / 5) >> 0)) / 10; // chrome 54.x: zoom = "reset" - clear retina zoom (windows)
me.zoom = window.devicePixelRatio / _devicePixelRatio; //document.firstElementChild.style.zoom = "reset";
document.firstElementChild.style.zoom = 1.0 / me.zoom;
// chrome 54.x: zoom = "reset" - clear retina zoom (windows) }
//document.firstElementChild.style.zoom = "reset"; else
document.firstElementChild.style.zoom = 1.0 / me.zoom; document.firstElementChild.style.zoom = "normal";
}
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.innerWidth = window.innerWidth * me.zoom;
me.innerHeight = window.innerHeight * me.zoom; me.innerHeight = window.innerHeight * me.zoom;