diff options
| author | mattab <matthieu.aubry@gmail.com> | 2015-05-20 08:45:26 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2015-05-20 08:45:26 +0300 |
| commit | 63fceb11ad67a9bfb623ccaab20e05ad6fcadd94 (patch) | |
| tree | c2376fdb835d6f95d80ff16451e1826e524adf55 /js | |
| parent | 52767315938d5d717731fa2d7a07da59ba663b82 (diff) | |
| parent | 5fa7055c997dc5f91dc153bda9d40c5bd4833b1d (diff) | |
Merge remote-tracking branch 'origin/master' into 5014
Conflicts:
piwik.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/piwik.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/piwik.js b/js/piwik.js index 3dd95a7927..4dcfacc350 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -4018,7 +4018,7 @@ if (typeof Piwik !== 'object') { gears: 'application/x-googlegears', ag: 'application/x-silverlight' }, - devicePixelRatio = (new RegExp('Mac OS X.*Safari/')).test(navigatorAlias.userAgent) ? windowAlias.devicePixelRatio || 1 : 1; + devicePixelRatio = windowAlias.devicePixelRatio || 1; // detect browser features except IE < 11 (IE 11 user agent is no longer MSIE) if (!((new RegExp('MSIE')).test(navigatorAlias.userAgent))) { @@ -4050,8 +4050,6 @@ if (typeof Piwik !== 'object') { } // screen resolution - // - only Apple reports screen.* in device-independent-pixels (dips) - // - devicePixelRatio is always 2 on MacOSX+Retina regardless of resolution set in Display Preferences browserFeatures.res = screenAlias.width * devicePixelRatio + 'x' + screenAlias.height * devicePixelRatio; } |