Changeset 7708 for trunk

Timestamp:

08/05/08 09:59:12 (2 weeks ago)

Author:

elemoine

Message:

Layer.Vector.removeMap must deactivate the strategies, r=fredj (closes #1649)

Files:

• trunk/openlayers/lib/OpenLayers/Layer/Vector.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Protocol.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Strategy.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Strategy/Fixed.js (modified) (1 diff)
• trunk/openlayers/tests/Protocol.html (modified) (2 diffs)
• trunk/openlayers/tests/Strategy.html (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Layer/Vector.js

@@ -230 +230 @@
-    destroy: function() {
-        if (this.strategies) {
-
-
+
+
+
+
+
+
-            }
-            this.strategies = null;
-        }
-        if (this.protocol) {
-
+
+
+
-            this.protocol = null;
-        }
@@ -297 +303 @@
-        }
-        if(this.strategies) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

trunk/openlayers/lib/OpenLayers/Protocol.js

@@ -21 +21 @@
-     */
-    options: null,
-
+
+
+
+
+
+
+
+
+
-    /**
-     * Constructor: OpenLayers.Protocol

trunk/openlayers/lib/OpenLayers/Strategy.js

@@ -22 +22 @@
-    options: null,
-
+    /** 
+     * Property: active 
+     * {Boolean} The control is active.
+     */
+    active: null,
+
+    /**
+     * Property: autoActivate
+     * {Boolean} The creator of the strategy can set autoActivate to false
+     *      to fully control when the protocol is activated and deactivated.
+     *      Defaults to true.
+     */
+    autoActivate: true,
+
+    /**
+     * Property: autoDestroy
+     * {Boolean} The creator of the strategy can set autoDestroy to false
+     *      to fully control when the strategy is destroyed. Defaults to
+     *      true.
+     */
+    autoDestroy: true,
+
-    /**
-     * Constructor: OpenLayers.Strategy
@@ -33 +55 @@
-        OpenLayers.Util.extend(this, options);
-        this.options = options;
+        // set the active property here, so that user cannot override it
+        this.active = false;
-    },
-    
@@ -58 +82 @@
-     * Method: activate
-     * Activate the strategy.  Register any listeners, do appropriate setup.
+     *
+     * Returns:
+     * {Boolean} True if the strategy was successfully activated or false if
+     *      the strategy was already active.
-     */
-    activate: function() {
+        if (!this.active) {
+            this.active = true;
+            return true;
+        }
+        return false;
-    },
-    
@@ -66 +99 @@
-     * Deactivate the strategy.  Unregister any listeners, do appropriate
-     *     tear-down.
+     *
+     * Returns:
+     * {Boolean} True if the strategy was successfully deactivated or false if
+     *      the strategy was already inactive.
-     */
-    deactivate: function() {
+        if (this.active) {
+            this.active = false;
+            return true;
+        }
+        return false;
-    },
-   

trunk/openlayers/lib/OpenLayers/Strategy/Fixed.js

@@ -40 +40 @@
-     * Activate the strategy: reads all features from the protocol and add them 
-     * to the layer.
+     *
+     * Returns:
+     * {Boolean} True if the strategy was successfully activated or false if
+     *      the strategy was already active.
-     */
-    activate: function() {
-
-
-
-
-
+
+
+
+
+
+
+
+
-    },
-

trunk/openlayers/tests/Protocol.html

@@ -5 +5 @@
-
-    function test_initialize(t) {
-2
+3
-        var options = {};
-        var protocol = new OpenLayers.Protocol(options);
@@ -12 +12 @@
-             "new OpenLayers.Protocol returns object" );
-        t.eq(protocol.options, options, "constructor sets this.options");
+        t.eq(protocol.autoDestroy, true, "constructor does not modify this.autoDestroy");
-    }
-    

trunk/openlayers/tests/Strategy.html

@@ -5 +5 @@
-
-    function test_initialize(t) {
-2
+5
-        var options = {};
-        var strategy = new OpenLayers.Strategy(options);
@@ -12 +12 @@
-             "new OpenLayers.Strategy returns object" );
-        t.eq(strategy.options, options, "constructor sets this.options");
+        t.eq(strategy.active, false, "constructor sets this.active to false");
+        t.eq(strategy.autoActivate, true, "constructor does not modify this.autoActivate");
+        t.eq(strategy.autoDestroy, true, "constructor does not modify this.autoDestroy");
-    }
-
@@ -47 +50 @@
-    }
-
+    function test_activate(t) {
+        t.plan(4);
+        var strategy = new OpenLayers.Strategy({
+            layer: 'foo'
+        });
+
+        var ret;
+        ret = strategy.activate();
+
+        t.eq(strategy.active, true, "activate sets this.active to true on first call");
+        t.eq(ret, true, "activate returns true on first call");
+
+        ret = strategy.activate();
+
+        t.eq(strategy.active, true, "activate does not modify this.active on second call");
+        t.eq(ret, false, "activate returns false on second call");
+    }
+
+    function test_deactivate(t) {
+        t.plan(4);
+        var strategy = new OpenLayers.Strategy({
+            layer: 'foo'
+        });
+        strategy.activate();
+
+        var ret;
+        ret = strategy.deactivate();
+
+        t.eq(strategy.active, false, "deactivate sets this.active to false on first call");
+        t.eq(ret, true, "deactivate returns true on first call");
+
+        ret = strategy.deactivate();
+
+        t.eq(strategy.active, false, "deactivate does not modify this.active on second call");
+        t.eq(ret, false, "deactivate returns false on second call");
+    }
+
-  </script>
-</head>