[OpenLayers-Commits] r10905 - in trunk/openlayers: examples lib/OpenLayers lib/OpenLayers/Popup

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2010-11-20 09:36:15 -0800 (Sat, 20 Nov 2010)
New Revision: 10905

Modified:
   trunk/openlayers/examples/proxy.cgi
   trunk/openlayers/lib/OpenLayers/Popup/Anchored.js
   trunk/openlayers/lib/OpenLayers/Util.js
Log:
reverting r10700 (closes #2870)


Modified: trunk/openlayers/examples/proxy.cgi
===================================================================
--- trunk/openlayers/examples/proxy.cgi	2010-11-18 13:39:08 UTC (rev 10904)
+++ trunk/openlayers/examples/proxy.cgi	2010-11-20 17:36:15 UTC (rev 10905)
@@ -21,7 +21,7 @@
                 '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"]
 

Modified: trunk/openlayers/lib/OpenLayers/Popup/Anchored.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Popup/Anchored.js	2010-11-18 13:39:08 UTC (rev 10904)
+++ trunk/openlayers/lib/OpenLayers/Popup/Anchored.js	2010-11-20 17:36:15 UTC (rev 10905)
@@ -186,10 +186,10 @@
         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;   
     },

Modified: trunk/openlayers/lib/OpenLayers/Util.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Util.js	2010-11-18 13:39:08 UTC (rev 10904)
+++ trunk/openlayers/lib/OpenLayers/Util.js	2010-11-20 17:36:15 UTC (rev 10905)
@@ -1633,10 +1633,12 @@
 
 /**
  * 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;
 })();
 
 /**