[OpenLayers-Commits] r11540 - sandbox/pinch/lib/OpenLayers/Control

[commits-20090109 at openlayers.org]

Author: tschaub
Date: 2011-02-25 12:23:22 -0800 (Fri, 25 Feb 2011)
New Revision: 11540

Modified:
   sandbox/pinch/lib/OpenLayers/Control/PinchZoom.js
Log:
autoActivate by default, separate method for testing.

Modified: sandbox/pinch/lib/OpenLayers/Control/PinchZoom.js
===================================================================
--- sandbox/pinch/lib/OpenLayers/Control/PinchZoom.js	2011-02-25 19:20:19 UTC (rev 11539)
+++ sandbox/pinch/lib/OpenLayers/Control/PinchZoom.js	2011-02-25 20:23:22 UTC (rev 11540)
@@ -38,6 +38,13 @@
      * {Object} Cached object representing the latest pinch center (in pixels).
      */
     currentCenter: null,    
+
+    /**
+     * APIProperty: autoActivate
+     * {Boolean} Activate the control when it is added to a map.  Default is
+     *     true.
+     */
+    autoActivate: true,
     
     /**
      * Constructor: OpenLayers.Control.PinchZoom
@@ -135,13 +142,21 @@
 
         var dx = Math.round((current.x - pinchOrigin.x) + (scale - 1) * (containerOrigin.x - pinchOrigin.x));
         var dy = Math.round((current.y - pinchOrigin.y) + (scale - 1) * (containerOrigin.y - pinchOrigin.y));
-        
+
+        this.applyTransform(
+            "translate(" + dx + "px, " + dy + "px) scale(" + scale + ")"
+        );
+        this.currentCenter = current;
+    },
+    
+    /**
+     * Method: applyTransform
+     * Applies the given transform to layers.
+     */
+    applyTransform: function(transform) {
         var style = this.map.layerContainerDiv.style;
-        var transform = "translate(" + dx + "px, " + dy + "px) scale(" + scale + ")";
         style['-webkit-transform'] = transform;
         style['-moz-transform'] = transform;
-
-        this.currentCenter = current;
     },
     
     /**