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

Merge branch 'master' of github.com:CloudMade/Leaflet

Browse Source
This commit is contained in:
Vladimir Agafonkin 2012-11-07 14:13:33 +02:00
commit 9e70816030
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dist/leaflet.ie.css vendored
View File

@ -27,6 +27,9 @@
.leaflet-popup-content-wrapper, .leaflet-popup-tip {
border: 1px solid #bbb;
}
.leaflet-popup-content-wrapper {
zoom: 1;
}
.leaflet-control-zoom {
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#3F000000',EndColorStr='#3F000000');

4
src/layer/LayerGroup.js
View File

@ -24,6 +24,8 @@ L.LayerGroup = L.Class.extend({
this._map.addLayer(layer);
}
this.fire('layeradd', { layer: layer });
return this;
},
@ -36,6 +38,8 @@ L.LayerGroup = L.Class.extend({
this._map.removeLayer(layer);
}
this.fire('layerremove', { layer: layer });
return this;
},

5
src/layer/marker/Marker.js
View File

@ -203,10 +203,11 @@ L.Marker = L.Class.extend({
},
_onMouseClick: function (e) {
if (this.hasEventListeners(e.type)) {
var wasDragged = this.dragging && this.dragging.moved();
if (this.hasEventListeners(e.type) || wasDragged) {
L.DomEvent.stopPropagation(e);
}
if (this.dragging && this.dragging.moved()) { return; }
if (wasDragged) { return; }
if (this._map.dragging && this._map.dragging.moved()) { return; }
this.fire(e.type, {
originalEvent: e

4
src/layer/vector/Path.SVG.js
View File

@ -134,7 +134,9 @@ L.Path = L.Path.extend({
if (e.type === 'contextmenu') {
L.DomEvent.preventDefault(e);
}
L.DomEvent.stopPropagation(e);
if (e.type !== 'mousemove') {
L.DomEvent.stopPropagation(e);
}
}
});