Ticket #1649: patch-1649-r7658-B0.diff
| File patch-1649-r7658-B0.diff, 7.6 kB (added by elemoine, 5 months ago) |
|---|
-
tests/Protocol.html
old new 4 4 <script type="text/javascript"> 5 5 6 6 function test_initialize(t) { 7 t.plan( 2);7 t.plan(3); 8 8 var options = {}; 9 9 var protocol = new OpenLayers.Protocol(options); 10 10 11 11 t.ok(protocol instanceof OpenLayers.Protocol, 12 12 "new OpenLayers.Protocol returns object" ); 13 13 t.eq(protocol.options, options, "constructor sets this.options"); 14 t.eq(protocol.autoDestroy, true, "constructor does not modify this.autoDestroy"); 14 15 } 15 16 16 17 function test_destroy(t) { -
tests/Strategy.html
old new 4 4 <script type="text/javascript"> 5 5 6 6 function test_initialize(t) { 7 t.plan( 2);7 t.plan(5); 8 8 var options = {}; 9 9 var strategy = new OpenLayers.Strategy(options); 10 10 11 11 t.ok(strategy instanceof OpenLayers.Strategy, 12 12 "new OpenLayers.Strategy returns object" ); 13 13 t.eq(strategy.options, options, "constructor sets this.options"); 14 t.eq(strategy.active, false, "constructor sets this.active to false"); 15 t.eq(strategy.autoActivate, true, "constructor does not modify this.autoActivate"); 16 t.eq(strategy.autoDestroy, true, "constructor does not modify this.autoDestroy"); 14 17 } 15 18 16 19 function test_destroy(t) { … … 23 26 t.eq(strategy.layer, null, "destroy nullify protocol.layer"); 24 27 } 25 28 29 function test_activate(t) { 30 t.plan(4); 31 var strategy = new OpenLayers.Strategy({ 32 layer: 'foo' 33 }); 34 35 var ret; 36 ret = strategy.activate(); 37 38 t.eq(strategy.active, true, "activate sets this.active to true on first call"); 39 t.eq(ret, true, "activate returns true on first call"); 40 41 ret = strategy.activate(); 42 43 t.eq(strategy.active, true, "activate does not modify this.active on second call"); 44 t.eq(ret, false, "activate returns false on second call"); 45 } 46 47 function test_deactivate(t) { 48 t.plan(4); 49 var strategy = new OpenLayers.Strategy({ 50 layer: 'foo' 51 }); 52 strategy.activate(); 53 54 var ret; 55 ret = strategy.deactivate(); 56 57 t.eq(strategy.active, false, "deactivate sets this.active to false on first call"); 58 t.eq(ret, true, "deactivate returns true on first call"); 59 60 ret = strategy.deactivate(); 61 62 t.eq(strategy.active, false, "deactivate does not modify this.active on second call"); 63 t.eq(ret, false, "deactivate returns false on second call"); 64 } 65 26 66 </script> 27 67 </head> 28 68 <body> -
lib/OpenLayers/Layer/Vector.js
old new 229 229 */ 230 230 destroy: function() { 231 231 if (this.stategies) { 232 for(var i=0, len=this.strategies.length; i<len; i++) { 233 this.strategies[i].destroy(); 232 var strategy, i, len; 233 for(i=0, len=this.strategies.length; i<len; i++) { 234 strategy = this.strategies[i]; 235 if(strategy.autoDestroy) { 236 strategy.destroy(); 237 } 234 238 } 235 239 this.strategies = null; 236 240 } 237 241 if (this.protocol) { 238 this.protocol.destroy(); 242 if(this.protocol.autoDestroy) { 243 this.protocol.destroy(); 244 } 239 245 this.protocol = null; 240 246 } 241 247 this.destroyFeatures(); … … 296 302 this.renderer.setSize(this.map.getSize()); 297 303 } 298 304 if(this.strategies) { 299 for(var i=0, len=this.strategies.length; i<len; i++) { 300 this.strategies[i].activate(); 305 var strategy, i, len; 306 for(i=0, len=this.strategies.length; i<len; i++) { 307 strategy = this.strategies[i]; 308 if(strategy.autoActivate) { 309 strategy.activate(); 310 } 301 311 } 302 312 } 303 313 }, 314 315 /** 316 * Method: removeMap 317 * The layer has been removed from the map. 318 * 319 * Parameters: 320 * map - {<OpenLayers.Map>} 321 */ 322 removeMap: function(map) { 323 if(this.strategies) { 324 var strategy, i, len; 325 for(i=0, len=this.strategies.length; i<len; i++) { 326 strategy = this.strategies[i]; 327 if(strategy.autoActivate) { 328 strategy.deactivate(); 329 } 330 } 331 } 332 }, 304 333 305 334 /** 306 335 * Method: onMapResize -
lib/OpenLayers/Protocol.js
old new 20 20 * Any options sent to the constructor. 21 21 */ 22 22 options: null, 23 23 24 24 /** 25 * Property: autoDestroy 26 * {Boolean} The creator of the protocol can set autoDestroy to false 27 * to fully control when the protocol is destroyed. Defaults to 28 * true. 29 */ 30 autoDestroy: true, 31 32 /** 25 33 * Constructor: OpenLayers.Protocol 26 34 * Abstract class for vector protocols. Create instances of a subclass. 27 35 * -
lib/OpenLayers/Strategy.js
old new 21 21 */ 22 22 options: null, 23 23 24 /** 25 * Property: active 26 * {Boolean} The control is active. 27 */ 28 active: null, 29 24 30 /** 31 * Property: autoActivate 32 * {Boolean} The creator of the strategy can set autoActivate to false 33 * to fully control when the protocol is activated and deactivated. 34 * Defaults to true. 35 */ 36 autoActivate: true, 37 38 /** 39 * Property: autoDestroy 40 * {Boolean} The creator of the strategy can set autoDestroy to false 41 * to fully control when the strategy is destroyed. Defaults to 42 * true. 43 */ 44 autoDestroy: true, 45 46 /** 25 47 * Constructor: OpenLayers.Strategy 26 48 * Abstract class for vector strategies. Create instances of a subclass. 27 49 * … … 32 54 initialize: function(options) { 33 55 OpenLayers.Util.extend(this, options); 34 56 this.options = options; 57 this.active = false; 35 58 }, 36 59 37 60 /** … … 56 79 /** 57 80 * Method: activate 58 81 * Activate the strategy. Register any listeners, do appropriate setup. 82 * 83 * Returns: 84 * {Boolean} True if the strategy was effectively deactivated and false 85 * if it was already activated. 59 86 */ 60 87 activate: function() { 88 if (!this.active) { 89 this.active = true; 90 return true; 91 } 92 return false; 61 93 }, 62 94 63 95 /** 64 96 * Method: deactivate 65 97 * Deactivate the strategy. Unregister any listeners, do appropriate 66 98 * tear-down. 99 * 100 * Returns: 101 * {Boolean} True if the strategy was effectively activated and false 102 * if it was already deactivated. 67 103 */ 68 104 deactivate: function() { 105 if (this.active) { 106 this.active = false; 107 return true; 108 } 109 return false; 69 110 }, 70 111 71 112 CLASS_NAME: "OpenLayers.Strategy"
