Changeset 7421

Timestamp:

06/21/08 12:02:16 (5 months ago)

Author:

tschaub

Message:

Reset page number when clearing cache.

Files:

• sandbox/vector-behavior/OpenLayers.js (modified) (1 diff)
• sandbox/vector-behavior/lib/OpenLayers/Strategy/Paging.js (modified) (2 diffs)

sandbox/vector-behavior/OpenLayers.js

@@ -319 +319 @@
-return OpenLayers.Request.issue(config);},DELETE:function(config){config=OpenLayers.Util.extend(config,{method:"DELETE"});return OpenLayers.Request.issue(config);},HEAD:function(config){config=OpenLayers.Util.extend(config,{method:"HEAD"});return OpenLayers.Request.issue(config);},OPTIONS:function(config){config=OpenLayers.Util.extend(config,{method:"OPTIONS"});return OpenLayers.Request.issue(config);}};OpenLayers.Strategy=new OpenLayers.Class({layer:null,initialize:function(options){OpenLayers.Util.extend(this,options);},destroy:function(){this.layer=null;this.deactivate();},setLayer:function(layer){this.layer=layer;},activate:function(){},deactivate:function(){},update:function(){},remove:function(){},commit:function(){},merge:function(){},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Paging=new OpenLayers.Class(OpenLayers.Strategy,{layer:null,cache:null,length:10,num:null,paging:false,initialize:function(options){OpenLayers.Strategy.prototype.initialize.apply(this,[options]);},activate:function(){this.layer.events.on({"beforefeaturesadded":this.cacheFeatures,scope:this});},deactivate:function(){delete this.layer.page;this.clearCache();this.layer.events.un({"beforefeaturesadded":this.cacheFeatures,scope:this});},cacheFeatures:function(event){var propigate=true;if(!this.paging){this.clearCache();this.cache=event.features;this.pageNext();propigate=false;}
-return propigate;},clearCache:function(){if(this.cache){for(var i=0;i<this.cache.length;++i){this.cache[i].destroy();}}
-
+this.num=null;
-return this.length;},pageNext:function(){var changed=false;if(this.cache){if(this.num===null){this.num=-1;}
-var start=(this.num+1)*this.length;changed=this.page(start);}
-return changed;},pagePrevious:function(){var changed=false;if(this.cache){if(this.num===null){this.num=this.pageCount();}
-var start=(this.num-1)*this.length;changed=this.page(start);}
-var features=this.cache.slice(start,start+this.length);this.layer.removeFeatures(this.layer.features);this.layer.addFeatures(features,{silent:true});this.num=num;this.paging=true
+this.paging=true;var features=this.cache.slice(start,start+this.length);this.layer.removeFeatures(this.layer.features);this.layer.addFeatures(features,{silent:true});this.num=num
-return changed;},CLASS_NAME:"OpenLayers.Strategy.Paging"});OpenLayers.Tween=OpenLayers.Class({INTERVAL:10,easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,interval:null,playing:false,initialize:function(easing){this.easing=(easing)?easing:OpenLayers.Easing.Expo.easeOut;},start:function(begin,finish,duration,options){this.playing=true;this.begin=begin;this.finish=finish;this.duration=duration;this.callbacks=options.callbacks;this.time=0;if(this.interval){window.clearInterval(this.interval);this.interval=null;}
-if(this.callbacks&&this.callbacks.start){this.callbacks.start.call(this,this.begin);}

sandbox/vector-behavior/lib/OpenLayers/Strategy/Paging.js

@@ -102 +102 @@
-        }
-        this.cache = null;
+        this.num = null;
-    },
-    
@@ -195 +196 @@
-                var num = Math.floor(start / this.length);
-                if(num != this.num) {
+                    this.paging = true;
-                    var features = this.cache.slice(start, start + this.length);
-                    this.layer.removeFeatures(this.layer.features);
-                    this.layer.addFeatures(features, {silent: true});
-                    this.num = num;
-                    this.paging = true;
-                    this.layer.events.triggerEvent("featuresadded", {
-                        features: features,