Skip to content

Upgrade to v0.7.3 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
willfarrell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to v0.7.3 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "leaflet",
"version": "0.7.2",
"version": "0.7.3",
"main": ["leaflet-src.js", "leaflet.css"],
"description": "Leaflet Bower package",
"ignore": [
Expand All @@ -9,12 +9,12 @@
".gitignore"
],
"homepage": "https://github.com/vperron/leaflet-dist",
"_release": "0.7.2",
"_release": "0.7.3",
"_resolution": {
"type": "version",
"tag": "v0.7.2"
"tag": "v0.7.3"
},
"_source": "git://github.com/vperron/leaflet-dist.git",
"_target": "0.7.2",
"_target": "0.7.3",
"_originalSource": "leaflet"
}
55 changes: 33 additions & 22 deletions leaflet-src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
var oldL = window.L,
L = {};

L.version = '0.7.2';
L.version = '0.7.3';

// define Leaflet for Node module pattern loaders, including Browserify
if (typeof module === 'object' && typeof module.exports === 'object') {
Expand Down Expand Up @@ -2104,13 +2104,13 @@ L.Map = L.Class.extend({
var loading = !this._loaded;
this._loaded = true;

this.fire('viewreset', {hard: !preserveMapOffset});

if (loading) {
this.fire('load');
this.eachLayer(this._layerAdd, this);
}

this.fire('viewreset', {hard: !preserveMapOffset});

this.fire('move');

if (zoomChanged || afterZoomAnim) {
Expand Down Expand Up @@ -5083,7 +5083,8 @@ L.Path = (L.Path.SVG && !window.L_PREFER_CANVAS) || !L.Browser.canvas ? L.Path :
}

this._requestUpdate();


this.fire('remove');
this._map = null;
},

Expand Down Expand Up @@ -6605,12 +6606,12 @@ L.DomEvent = {
var timeStamp = (e.timeStamp || e.originalEvent.timeStamp),
elapsed = L.DomEvent._lastClick && (timeStamp - L.DomEvent._lastClick);

// are they closer together than 1000ms yet more than 100ms?
// are they closer together than 500ms yet more than 100ms?
// Android typically triggers them ~300ms apart while multiple listeners
// on the same event should be triggered far faster;
// or check if click is simulated on the element, and if it is, reject any non-simulated events

if ((elapsed && elapsed > 100 && elapsed < 1000) || (e.target._simulatedClick && !e._simulated)) {
if ((elapsed && elapsed > 100 && elapsed < 500) || (e.target._simulatedClick && !e._simulated)) {
L.DomEvent.stop(e);
return;
}
Expand Down Expand Up @@ -6708,6 +6709,7 @@ L.Draggable = L.Class.extend({
offset = newPoint.subtract(this._startPoint);

if (!offset.x && !offset.y) { return; }
if (L.Browser.touch && Math.abs(offset.x) + Math.abs(offset.y) < 3) { return; }

L.DomEvent.preventDefault(e);

Expand All @@ -6718,7 +6720,8 @@ L.Draggable = L.Class.extend({
this._startPos = L.DomUtil.getPosition(this._element).subtract(offset);

L.DomUtil.addClass(document.body, 'leaflet-dragging');
L.DomUtil.addClass((e.target || e.srcElement), 'leaflet-drag-target');
this._lastTarget = e.target || e.srcElement;
L.DomUtil.addClass(this._lastTarget, 'leaflet-drag-target');
}

this._newPos = this._startPos.add(offset);
Expand All @@ -6734,9 +6737,13 @@ L.Draggable = L.Class.extend({
this.fire('drag');
},

_onUp: function (e) {
_onUp: function () {
L.DomUtil.removeClass(document.body, 'leaflet-dragging');
L.DomUtil.removeClass((e.target || e.srcElement), 'leaflet-drag-target');

if (this._lastTarget) {
L.DomUtil.removeClass(this._lastTarget, 'leaflet-drag-target');
this._lastTarget = null;
}

for (var i in L.Draggable.MOVE) {
L.DomEvent
Expand Down Expand Up @@ -7391,7 +7398,7 @@ L.Map.TouchZoom = L.Handler.extend({
center = map.layerPointToLatLng(origin),
zoom = map.getScaleZoom(this._scale);

map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta);
map._animateZoom(center, zoom, this._startCenter, this._scale, this._delta, false, true);
},

_onTouchEnd: function () {
Expand Down Expand Up @@ -8376,8 +8383,8 @@ L.Control.Layers = L.Control.extend({

onRemove: function (map) {
map
.off('layeradd', this._onLayerChange)
.off('layerremove', this._onLayerChange);
.off('layeradd', this._onLayerChange, this)
.off('layerremove', this._onLayerChange, this);
},

addBaseLayer: function (layer, name) {
Expand Down Expand Up @@ -8918,9 +8925,11 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
return true;
},

_animateZoom: function (center, zoom, origin, scale, delta, backwards) {
_animateZoom: function (center, zoom, origin, scale, delta, backwards, forTouchZoom) {

this._animatingZoom = true;
if (!forTouchZoom) {
this._animatingZoom = true;
}

// put transform transition on all layers with leaflet-zoom-animated class
L.DomUtil.addClass(this._mapPane, 'leaflet-zoom-anim');
Expand All @@ -8934,14 +8943,16 @@ L.Map.include(!L.DomUtil.TRANSITION ? {} : {
L.Draggable._disabled = true;
}

this.fire('zoomanim', {
center: center,
zoom: zoom,
origin: origin,
scale: scale,
delta: delta,
backwards: backwards
});
L.Util.requestAnimFrame(function () {
this.fire('zoomanim', {
center: center,
zoom: zoom,
origin: origin,
scale: scale,
delta: delta,
backwards: backwards
});
}, this);
},

_onZoomTransitionEnd: function () {
Expand Down
Loading