ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

final patch for #510 -- new datastructure suggested and implemented by james for the events entry cache. speeds up all event operations

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@2896 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-03-26 17:33:35 +00:00
parent d82108c2d7
commit 87977f7bfe
3 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/OpenLayers/Events.js
View File

@@ -55,23 +55,40 @@ OpenLayers.Event = {
return element;
},
/** A hashtable cach of the event observers, keyed by element.id
*
* @type Object
*/
observers: false,
_observeAndCache: function(element, name, observer, useCapture) {
if (!this.observers) this.observers = [];
if (!this.observers) this.observers = new Object();
//if there is not yet a hash entry for this element, add one
if (!this.observers[element.id]) {
this.observers[element.id] = new Array();
}
//add a new observer to this element's list
this.observers[element.id].push([name, observer, useCapture]);
//add the actual browser event listener
if (element.addEventListener) {
this.observers.push([element, name, observer, useCapture]);
element.addEventListener(name, observer, useCapture);
} else if (element.attachEvent) {
this.observers.push([element, name, observer, useCapture]);
element.attachEvent('on' + name, observer);
}
},
unloadCache: function() {
if (!OpenLayers.Event.observers) return;
for (var i = 0; i < OpenLayers.Event.observers.length; i++) {
OpenLayers.Event.stopObserving.apply(this, OpenLayers.Event.observers[i]);
for (var elementId in OpenLayers.Event.observers) {
var elementObservers = OpenLayers.Event.observers[elementId];
if (elementObservers) {
for (var i = 0; i < elementObservers.length; i++) {
var args = new Array(elementId).concat(elementObservers[i]);
OpenLayers.Event.stopObserving.apply(this, args);
}
}
}
OpenLayers.Event.observers = false;
},
@@ -90,6 +107,8 @@ OpenLayers.Event = {
stopObserving: function(elementParam, name, observer, useCapture) {
var element = OpenLayers.Util.getElement(elementParam);
if (!element) return;
useCapture = useCapture || false;
if (name == 'keypress' &&
@@ -97,28 +116,37 @@ OpenLayers.Event = {
|| element.detachEvent))
name = 'keydown';
// find entry in this.observers cache array and remove it
var observers = OpenLayers.Event.observers;
var entry = [element, name, observer, useCapture];
for (var i = 0; i < observers.length; i++) {
// find element's entry in this.observers cache and remove it
var elementObservers = OpenLayers.Event.observers[element.id];
if (elementObservers) {
var entry = [name, observer, useCapture];
//compare all 4 elements of entry with observer
var sameEntry = true;
for (var j = 0; j < entry.length; j++) {
if (entry[j] != observers[i][j]) {
sameEntry = false;
break;
// find the specific event type in the element's list
for (var i = 0; i < elementObservers.length; i++) {
var cacheEntry = elementObservers[i];
//compare all 3 elements of entry with observer
var sameEntry = true;
for (var j = 0; j < entry.length; j++) {
if (entry[j] != cacheEntry[j]) {
sameEntry = false;
break;
}
}
//if we've found it, remove it from the observers array
if (sameEntry) {
elementObservers.splice(i--, 1);
if (elementObservers.length == 0) {
OpenLayers.Event.observers[element.id] = null;
}
break;
}
}
//if we've found it, remove it from the observers array
if (sameEntry) {
observers.splice(i--, 1);
break;
}
}
if (element && element.removeEventListener) {
//actually remove the event listener from browser
if (element.removeEventListener) {
element.removeEventListener(name, observer, useCapture);
} else if (element && element.detachEvent) {
element.detachEvent('on' + name, observer);