[OpenLayers-Commits] r11796 - in sandbox/cmoullet/openlayers: . lib lib/OpenLayers/Handler

[commits-20090109 at openlayers.org]

Author: cmoullet
Date: 2011-03-30 07:37:59 -0700 (Wed, 30 Mar 2011)
New Revision: 11796

Modified:
   sandbox/cmoullet/openlayers/
   sandbox/cmoullet/openlayers/lib/OpenLayers.js
   sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js
   sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Path.js
   sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Polygon.js
Log:
Merge with trunk



Property changes on: sandbox/cmoullet/openlayers
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11775,11777-11790
   + /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11775,11777-11795

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js	2011-03-30 14:29:28 UTC (rev 11795)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Click.js	2011-03-30 14:37:59 UTC (rev 11796)
@@ -346,6 +346,10 @@
                 // already received a click
                 if (this.last.touches && this.last.touches.length === 1) {
                     // touch device, no dblclick event - this may be a double
+                    if (this["double"]) {
+                        // on Android don't let the browser zoom on the page
+                        OpenLayers.Event.stop(evt);
+                    }
                     this.handleDouble(evt);
                 }
                 // if we're not in a touch environment we clear the click timer

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Path.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Path.js	2011-03-30 14:29:28 UTC (rev 11795)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Path.js	2011-03-30 14:37:59 UTC (rev 11796)
@@ -25,7 +25,7 @@
      * {<OpenLayers.Feature.Vector>}
      */
     line: null,
-    
+
     /**
      * Property: freehand
      * {Boolean} In freehand mode, the handler starts the path on mouse down,
@@ -234,7 +234,7 @@
             this.passesTolerance(this.lastTouchPx, evt.xy, this.dblclickTolerance)) {
             // double-tap, finalize the geometry
             this.lastTouchPx = evt.xy; // for up() to detect dblclick and do nothing
-            this.finishTouchGeometry();
+            this.finishGeometry();
             window.clearTimeout(this.timerId);
             this.timerId = null;
             return false;
@@ -337,14 +337,6 @@
     },
 
     /**
-     * Method: finishTouchGeometry
-     * Finish the geometry and send it back to the control.
-     */
-    finishTouchGeometry: function() {
-        this.finishGeometry();
-    },
-
-    /**
      * APIMethod: finishGeometry
      * Finish the geometry and send it back to the control.
      */

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Polygon.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Polygon.js	2011-03-30 14:29:28 UTC (rev 11795)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Handler/Polygon.js	2011-03-30 14:37:59 UTC (rev 11796)
@@ -151,10 +151,10 @@
     },
 
     /**
-     * Method: finishTouchGeometry
+     * Method: finishGeometry
      * Finish the geometry and send it back to the control.
      */
-    finishTouchGeometry: function() {
+    finishGeometry: function() {
         var index = this.line.geometry.components.length - 2;
         this.line.geometry.removeComponent(this.line.geometry.components[index]);
         this.removePoint();
@@ -293,24 +293,5 @@
         return geometry;
     },
 
-    /**
-     * Method: dblclick
-     * Handle double-clicks.  Finish the geometry and send it back
-     * to the control.
-     * 
-     * Parameters:
-     * evt - {Event} 
-     */
-    dblclick: function(evt) {
-        if(!this.freehandMode(evt)) {
-            // remove the penultimate point
-            var index = this.line.geometry.components.length - 2;
-            this.line.geometry.removeComponent(this.line.geometry.components[index]);
-            this.removePoint();
-            this.finalize();
-        }
-        return false;
-    },
-
     CLASS_NAME: "OpenLayers.Handler.Polygon"
 });

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers.js	2011-03-30 14:29:28 UTC (rev 11795)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers.js	2011-03-30 14:37:59 UTC (rev 11796)
@@ -330,8 +330,8 @@
                 "OpenLayers/Format/WMTSCapabilities.js",
                 "OpenLayers/Format/WMTSCapabilities/v1_0_0.js",
                 "OpenLayers/Format/XLS.js",
- 		        "OpenLayers/Format/XLS/v1.js",
- 		        "OpenLayers/Format/XLS/v1_1_0.js",
+                "OpenLayers/Format/XLS/v1.js",
+                "OpenLayers/Format/XLS/v1_1_0.js",
                 "OpenLayers/Layer/WFS.js",
                 "OpenLayers/Control/GetFeature.js",
                 "OpenLayers/Control/MouseToolbar.js",