Update to leaflet 0.7.7.

This commit is contained in:
David Molineus
2015-10-30 23:43:00 +01:00
parent b49da13abe
commit 461ac3544c
6 changed files with 23 additions and 17 deletions

View File

@@ -12,7 +12,7 @@ Contao CMS.
This package contains following packages: This package contains following packages:
- [leaflet 0.7.5](http://leafletjs.com) - [leaflet 0.7.7](http://leafletjs.com)
- [Leaflet-providers 1.1.5](http://leaflet-extras.github.io/leaflet-providers) - [Leaflet-providers 1.1.5](http://leaflet-extras.github.io/leaflet-providers)
- [Leaflet.markercluster 0.4.0](https://github.com/Leaflet/Leaflet.markercluster) - [Leaflet.markercluster 0.4.0](https://github.com/Leaflet/Leaflet.markercluster)
- [Leaflet-omnivore 0.3.2](https://github.com/mapbox/leaflet-omnivore) - [Leaflet-omnivore 0.3.2](https://github.com/mapbox/leaflet-omnivore)

View File

@@ -7,7 +7,7 @@
var oldL = window.L, var oldL = window.L,
L = {}; L = {};
L.version = '0.7.5'; L.version = '0.7.7';
// define Leaflet for Node module pattern loaders, including Browserify // define Leaflet for Node module pattern loaders, including Browserify
if (typeof module === 'object' && typeof module.exports === 'object') { if (typeof module === 'object' && typeof module.exports === 'object') {
@@ -520,7 +520,7 @@ L.Mixin.Events.fire = L.Mixin.Events.fireEvent;
mobile = typeof orientation !== undefined + '', mobile = typeof orientation !== undefined + '',
msPointer = !window.PointerEvent && window.MSPointerEvent, msPointer = !window.PointerEvent && window.MSPointerEvent,
pointer = (window.PointerEvent && window.navigator.pointerEnabled && window.navigator.maxTouchPoints) || pointer = (window.PointerEvent && window.navigator.pointerEnabled) ||
msPointer, msPointer,
retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) || retina = ('devicePixelRatio' in window && window.devicePixelRatio > 1) ||
('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') && ('matchMedia' in window && window.matchMedia('(min-resolution:144dpi)') &&
@@ -4389,7 +4389,9 @@ L.FeatureGroup = L.LayerGroup.extend({
layer = this._layers[layer]; layer = this._layers[layer];
} }
if ('off' in layer) {
layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this); layer.off(L.FeatureGroup.EVENTS, this._propagateEvent, this);
}
L.LayerGroup.prototype.removeLayer.call(this, layer); L.LayerGroup.prototype.removeLayer.call(this, layer);
@@ -4709,7 +4711,7 @@ L.Path = L.Path.extend({
}, },
_fireMouseEvent: function (e) { _fireMouseEvent: function (e) {
if (!this.hasEventListeners(e.type)) { return; } if (!this._map || !this.hasEventListeners(e.type)) { return; }
var map = this._map, var map = this._map,
containerPoint = map.mouseEventToContainerPoint(e), containerPoint = map.mouseEventToContainerPoint(e),
@@ -7167,8 +7169,9 @@ L.extend(L.DomEvent, {
pointers = this._pointers; pointers = this._pointers;
var cb = function (e) { var cb = function (e) {
if (e.pointerType !== 'mouse' && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
L.DomEvent.preventDefault(e); L.DomEvent.preventDefault(e);
}
var alreadyInArray = false; var alreadyInArray = false;
for (var i = 0; i < pointers.length; i++) { for (var i = 0; i < pointers.length; i++) {
@@ -8939,11 +8942,13 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim'); L.DomUtil.removeClass(this._mapPane, 'leaflet-zoom-anim');
L.Util.requestAnimFrame(function () {
this._resetView(this._animateToCenter, this._animateToZoom, true, true); this._resetView(this._animateToCenter, this._animateToZoom, true, true);
if (L.Draggable) { if (L.Draggable) {
L.Draggable._disabled = false; L.Draggable._disabled = false;
} }
}, this);
} }
}); });

View File

@@ -21,6 +21,7 @@
.leaflet-container { .leaflet-container {
overflow: hidden; overflow: hidden;
-ms-touch-action: none; -ms-touch-action: none;
touch-action: none;
} }
.leaflet-tile, .leaflet-tile,
.leaflet-marker-icon, .leaflet-marker-icon,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -17,7 +17,7 @@
$GLOBALS['LEAFLET_LIBRARIES']['leaflet'] = array $GLOBALS['LEAFLET_LIBRARIES']['leaflet'] = array
( (
'name' => 'Leaflet', 'name' => 'Leaflet',
'version' => '0.7.5', 'version' => '0.7.7',
'license' => '<a href="https://github.com/Leaflet/Leaflet/blob/master/LICENSE" target="_blank">BSD-2-Clause</a>', 'license' => '<a href="https://github.com/Leaflet/Leaflet/blob/master/LICENSE" target="_blank">BSD-2-Clause</a>',
'homepage' => 'http://leafletjs.com', 'homepage' => 'http://leafletjs.com',
'css' => 'assets/leaflet/libs/leaflet/leaflet.min.css', 'css' => 'assets/leaflet/libs/leaflet/leaflet.min.css',