cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fast event propagation (10x FeatureGroup layer add speedup)

Browse Source
This commit is contained in:
Vladimir Agafonkin 2013-12-17 17:08:21 -05:00
parent 1cc9ecdded
commit f631513acc
2 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/core/Events.js
View File

@ -113,42 +113,51 @@ L.Evented = L.Class.extend({
return this;
}
var event = L.Util.extend({}, data, { type: type, target: this });
var events = this[eventsKey],
var event = L.Util.extend({}, data, {type: type, target: this}),
events = this[eventsKey],
listeners, i, len, typeIndex, contextId;
if (events[type]) {
// make sure adding/removing listeners inside other listeners won't cause infinite loop
listeners = events[type].slice();
if (events) {
if (events[type]) {
// make sure adding/removing listeners inside other listeners won't cause infinite loop
listeners = events[type].slice();
for (i = 0, len = listeners.length; i < len; i++) {
listeners[i].action.call(listeners[i].context, event);
}
}
// fire event for the context-indexed listeners as well
typeIndex = events[type + '_idx'];
if (!typeIndex) { return this; }
for (contextId in typeIndex) {
listeners = typeIndex[contextId].slice();
if (listeners) {
for (i = 0, len = listeners.length; i < len; i++) {
listeners[i].action.call(listeners[i].context, event);
}
}
// fire event for the context-indexed listeners as well
typeIndex = events[type + '_idx'];
if (typeIndex) {
for (contextId in typeIndex) {
listeners = typeIndex[contextId].slice();
if (listeners) {
for (i = 0, len = listeners.length; i < len; i++) {
listeners[i].action.call(listeners[i].context, event);
}
}
}
}
}
this._propagateEvent(event);
return this;
},
hasEventListeners: function (type) {
var events = this[eventsKey];
return !!events && ((type in events && events[type].length > 0) ||
(type + '_idx' in events && events[type + '_idx_len'] > 0));
if (events && ((type in events && events[type].length > 0) ||
(type + '_idx' in events && events[type + '_idx_len'] > 0))) {
return true;
}
for (var id in this._eventParents) {
if (this._eventParents[id].hasEventListeners(type)) { return true; }
}
return false;
},
clearAllEventListeners: function () {
@ -169,6 +178,23 @@ L.Evented = L.Class.extend({
return this
.on(types, fn, context)
.on(types, handler, context);
},
addEventParent: function (obj) {
this._eventParents = this._eventParents || {};
this._eventParents[L.stamp(obj)] = obj;
},
removeEventParent: function (obj) {
if (this._eventParents) {
delete this._eventParents[L.stamp(obj)];
}
},
_propagateEvent: function (e) {
for (var id in this._eventParents) {
this._eventParents[id].fire(e.type, L.extend({layer: e.target}, e));
}
}
});

16
src/layer/FeatureGroup.js
View File

@ -5,16 +5,12 @@
L.FeatureGroup = L.LayerGroup.extend({
statics: {
EVENTS: 'click dblclick mouseover mouseout mousemove contextmenu popupopen popupclose'
},
addLayer: function (layer) {
if (this.hasLayer(layer)) {
return this;
}
layer.on(L.FeatureGroup.EVENTS, this._propagateEvent, this);
layer.addEventParent(this);
L.LayerGroup.prototype.addLayer.call(this, layer);
@ -33,7 +29,7 @@ L.FeatureGroup = L.LayerGroup.extend({
layer = this._layers[layer];
}
layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
layer.removeEventParent(this);
L.LayerGroup.prototype.removeLayer.call(this, layer);
@ -79,14 +75,6 @@ L.FeatureGroup = L.LayerGroup.extend({
});
return bounds;
},
_propagateEvent: function (e) {
e = L.extend({
layer: e.target,
target: this
}, e);
this.fire(e.type, e);
}
});