From b6965814056452a3c9cd0da03b5b4f231f6b1fa3 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Sat, 20 Nov 2010 17:36:15 +0000
Subject: [PATCH] reverting r10700 (closes #2870)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@10905 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 examples/proxy.cgi               | 2 +-
 lib/OpenLayers/Popup/Anchored.js | 4 ++--
 lib/OpenLayers/Util.js           | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/proxy.cgi b/examples/proxy.cgi
index 160bf4075f..943200413e 100755
--- a/examples/proxy.cgi
+++ b/examples/proxy.cgi
@@ -21,7 +21,7 @@ allowedHosts = ['www.openlayers.org', 'openlayers.org',
                 'sigma.openplans.org', 'demo.opengeo.org',
                 'www.openstreetmap.org', 'sample.azavea.com',
                 'v2.suite.opengeo.org', 'v-swe.uni-muenster.de:8080', 
-                'vmap0.tiles.osgeo.org']
+                'vmap0.tiles.osgeo.org', 'openmaps.gov.bc.ca', 'localhost:80']
 
 method = os.environ["REQUEST_METHOD"]
 
diff --git a/lib/OpenLayers/Popup/Anchored.js b/lib/OpenLayers/Popup/Anchored.js
index b89b21180f..9a7ac53926 100644
--- a/lib/OpenLayers/Popup/Anchored.js
+++ b/lib/OpenLayers/Popup/Anchored.js
@@ -186,10 +186,10 @@ OpenLayers.Popup.Anchored =
         var size = this.size || this.contentSize;
 
         var top = (this.relativePosition.charAt(0) == 't');
-        newPx.y += (top) ? -(size.h + this.anchor.size.h) : this.anchor.size.h;
+        newPx.y += (top) ? -size.h : this.anchor.size.h;
         
         var left = (this.relativePosition.charAt(1) == 'l');
-        newPx.x += (left) ? -(size.w + this.anchor.size.w) : this.anchor.size.w;
+        newPx.x += (left) ? -size.w : this.anchor.size.w;
 
         return newPx;   
     },
diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index f0e6725d45..32ccdeb758 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -1633,10 +1633,12 @@ OpenLayers.Util.removeTail = function(url) {
 
 /**
  * Constant: IS_GECKO
- * {Boolean} True if the userAgent reports the browser to use the Gecko engine
+ * {Boolean} True if the navigator.userAgent property reports the browser to
+ * use the Gecko engine
  */
 OpenLayers.IS_GECKO = (function() {
-    return navigator.userAgent.toLowerCase().indexOf("gecko") != -1;
+    var ua = navigator.userAgent.toLowerCase();
+    return ua.indexOf("gecko") != -1 && ua.indexOf("webkit") == -1;
 })();
 
 /**