Update leaflet to fix multiple adding causing event issues

This commit is contained in:
danzel
2012-07-12 16:59:47 +12:00
parent 5fa02c8435
commit dd34b194b6
2 changed files with 17 additions and 4 deletions

View File

@@ -371,10 +371,19 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
div = null; div = null;
return supported; return supported;
}()); }()),
ieversion = ie && (function () {
var re = new RegExp("msie ([0-9]{1,}[\\.0-9]{0,})");
if (re.exec(ua) !== null) {
return parseFloat(RegExp.$1);
}
return null;
}());
L.Browser = { L.Browser = {
ua: ua,
ie: ie, ie: ie,
iefilter: ie && ieversion < 9,
ie6: ie6, ie6: ie6,
webkit: webkit, webkit: webkit,
gecko: gecko, gecko: gecko,
@@ -715,8 +724,8 @@ L.DomUtil = {
}, },
setOpacity: function (el, value) { setOpacity: function (el, value) {
if (L.Browser.ie) { if (L.Browser.iefilter) {
el.style.filter += value !== 1 ? 'alpha(opacity=' + Math.round(value * 100) + ')' : ''; el.style.filter += value !== 1 ? 'alpha(opacity=' + Math.round(value * 100) + ')' : '';
} else { } else {
el.style.opacity = value; el.style.opacity = value;
} }
@@ -3319,6 +3328,10 @@ L.FeatureGroup = L.LayerGroup.extend({
includes: L.Mixin.Events, includes: L.Mixin.Events,
addLayer: function (layer) { addLayer: function (layer) {
if (this._layers[L.Util.stamp(layer)]) {
return this;
}
layer.on('click dblclick mouseover mouseout', this._propagateEvent, this); layer.on('click dblclick mouseover mouseout', this._propagateEvent, this);
L.LayerGroup.prototype.addLayer.call(this, layer); L.LayerGroup.prototype.addLayer.call(this, layer);

View File

File diff suppressed because one or more lines are too long