From 18e9ff98eed1e3d599386070365d1fc4b7c3c4f8 Mon Sep 17 00:00:00 2001 From: Nicholas Latham Date: Wed, 6 Apr 2016 21:05:49 +1200 Subject: [PATCH] Remove goog.labs.userAgent * Remove goog.labs.* * Change to function * Change window to this * Use goog.global --- src/ol/reproj/reproj.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ol/reproj/reproj.js b/src/ol/reproj/reproj.js index fd790d1869..119a6b354b 100644 --- a/src/ol/reproj/reproj.js +++ b/src/ol/reproj/reproj.js @@ -1,7 +1,5 @@ goog.provide('ol.reproj'); -goog.require('goog.labs.userAgent.browser'); -goog.require('goog.labs.userAgent.platform'); goog.require('ol.dom'); goog.require('ol.extent'); goog.require('ol.math'); @@ -18,8 +16,18 @@ goog.require('ol.proj'); * @type {boolean} * @private */ -ol.reproj.browserAntialiasesClip_ = !goog.labs.userAgent.browser.isChrome() || - goog.labs.userAgent.platform.isIos(); +ol.reproj.browserAntialiasesClip_ = (function(winNav, winChrome) { + // Adapted from http://stackoverflow.com/questions/4565112/javascript-how-to-find-out-if-the-user-browser-is-chrome + var isOpera = winNav.userAgent.indexOf('OPR') > -1; + var isIEedge = winNav.userAgent.indexOf('Edge') > -1; + return !( + !winNav.userAgent.match('CriOS') && // Not Chrome on iOS + winChrome !== null && winChrome !== undefined && // Has chrome in window + winNav.vendor === 'Google Inc.' && // Vendor is Google. + isOpera == false && // Not Opera + isIEedge == false // Not Edge + ); +})(goog.global.navigator, goog.global.chrome) /**