bump version, update changelog and build
This commit is contained in:
Vladimir Agafonkin
parent
7355070958
commit
d2f99f9b35
@ -3,9 +3,12 @@ Leaflet Changelog
|
||||
|
||||
(all changes without author notice are by [@mourner](https://github.com/mourner))
|
||||
|
||||
## 0.6-dev (master)
|
||||
## 0.7 (master)
|
||||
|
||||
An in-progress version being developed on the master branch.
|
||||
No changes since the latest stable yet.
|
||||
|
||||
## 0.6 (June 25, 2013)
|
||||
|
||||
### Breaking changes
|
||||
|
||||
@ -114,9 +117,10 @@ An in-progress version being developed on the master branch.
|
||||
|
||||
#### Browser bugfixes
|
||||
|
||||
* Fixed a bug with undesirable page scrolling when you zoom the map by scrolling in Firefox 17+ (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1789](https://github.com/Leaflet/Leaflet/issues/1789) [#1788](https://github.com/Leaflet/Leaflet/issues/1788)
|
||||
* Fixed a bug where `TileLayer` opacity didn't work in IE 7-8 (by [@javisantana](https://github.com/javisantana) & [@danzel](https://gi
|
||||
.com/danzel)). [#1084](https://github.com/Leaflet/Leaflet/issues/1084) [#1396](https://github.com/Leaflet/Leaflet/pull/1396) [#1371](https://github.com/Leaflet/Leaflet/issues/1371)
|
||||
* Fixed a bug in Android WebView where click was triggered twice on one tap (by [@jerel](https://github.com/jerel) & [@mourner](https://github.com/mourner)). [#1227](https://github.com/Leaflet/Leaflet/pull/1227) [#1263](https://github.com/Leaflet/Leaflet/issues/1263) [#1785](https://github.com/Leaflet/Leaflet/issues/1785) [#1694](https://github.com/Leaflet/Leaflet/issues/1694)
|
||||
* Fixed a bug in Android where click was triggered twice on one tap (by [@jerel](https://github.com/jerel) & [@mourner](https://github.com/mourner)). [#1227](https://github.com/Leaflet/Leaflet/pull/1227) [#1263](https://github.com/Leaflet/Leaflet/issues/1263) [#1785](https://github.com/Leaflet/Leaflet/issues/1785) [#1694](https://github.com/Leaflet/Leaflet/issues/1694)
|
||||
* Fixed a bug in Android where click on a collapsed layers control would immediately select one of the layers (by [@danzel](https://github.com/danzel)). [#1784](https://github.com/Leaflet/Leaflet/issues/1784) [#1694](https://github.com/Leaflet/Leaflet/issues/1694)
|
||||
* Fixed a bug where mouse coordinates where shifted in Firefox if the map was inside a positioned block on a scrolled page (by [@joschka](https://github.com/joschka)). [#1365](https://github.com/Leaflet/Leaflet/pull/1365) [#1322](https://github.com/Leaflet/Leaflet/issues/1322)
|
||||
* Fixed a bug where box zoom didn't work in some cases in Firefox 18+ (by [@fabriceds](https://github.com/fabriceds)). [#1405](https://github.com/Leaflet/Leaflet/pull/1405)
|
||||
|
||||
54
dist/leaflet-src.js
vendored
54
dist/leaflet-src.js
vendored
@ -7,7 +7,7 @@
|
||||
var oldL = window.L,
|
||||
L = {};
|
||||
|
||||
L.version = '0.6-dev';
|
||||
L.version = '0.6';
|
||||
|
||||
// define Leaflet for Node module pattern loaders, including Browserify
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
@ -3903,7 +3903,7 @@ L.Popup = L.Class.extend({
|
||||
L.DomEvent.disableClickPropagation(wrapper);
|
||||
|
||||
this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
|
||||
L.DomEvent.on(this._contentNode, 'mousewheel', L.DomEvent.stopPropagation);
|
||||
L.DomEvent.on(this._contentNode, 'wheel', L.DomEvent.stopPropagation);
|
||||
L.DomEvent.on(wrapper, 'contextmenu', L.DomEvent.stopPropagation);
|
||||
this._tipContainer = L.DomUtil.create('div', prefix + '-tip-container', container);
|
||||
this._tip = L.DomUtil.create('div', prefix + '-tip', this._tipContainer);
|
||||
@ -6097,14 +6097,18 @@ L.extend(L.GeoJSON, {
|
||||
}
|
||||
});
|
||||
|
||||
L.Marker.include({
|
||||
var PointToGeoJSON = {
|
||||
toGeoJSON: function () {
|
||||
return L.GeoJSON.getFeature(this, {
|
||||
type: 'Point',
|
||||
coordinates: L.GeoJSON.latLngToCoords(this.getLatLng())
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
L.Marker.include(PointToGeoJSON);
|
||||
L.Circle.include(PointToGeoJSON);
|
||||
L.CircleMarker.include(PointToGeoJSON);
|
||||
|
||||
L.Polyline.include({
|
||||
toGeoJSON: function () {
|
||||
@ -6186,6 +6190,11 @@ L.geoJson = function (geojson, options) {
|
||||
*/
|
||||
|
||||
L.DomEvent = {
|
||||
WHEEL:
|
||||
'onwheel' in document ? 'wheel' :
|
||||
'onmousewheel' in document ? 'mousewheel' :
|
||||
'MozMousePixelScroll',
|
||||
|
||||
/* inspired by John Resig, Dean Edwards and YUI addEvent implementations */
|
||||
addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
|
||||
|
||||
@ -6206,13 +6215,13 @@ L.DomEvent = {
|
||||
this.addDoubleTapListener(obj, handler, id);
|
||||
}
|
||||
|
||||
if (type === 'wheel' || type === 'mousewheel') {
|
||||
type = L.DomEvent.WHEEL;
|
||||
}
|
||||
|
||||
if ('addEventListener' in obj) {
|
||||
|
||||
if (type === 'mousewheel') {
|
||||
obj.addEventListener('DOMMouseScroll', handler, false);
|
||||
obj.addEventListener(type, handler, false);
|
||||
|
||||
} else if ((type === 'mouseenter') || (type === 'mouseleave')) {
|
||||
if ((type === 'mouseenter') || (type === 'mouseleave')) {
|
||||
|
||||
originalHandler = handler;
|
||||
newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');
|
||||
@ -6252,6 +6261,10 @@ L.DomEvent = {
|
||||
|
||||
if (!handler) { return this; }
|
||||
|
||||
if (type === 'wheel' || type === 'mousewheel') {
|
||||
type = L.DomEvent.WHEEL;
|
||||
}
|
||||
|
||||
if (L.Browser.msTouch && type.indexOf('touch') === 0) {
|
||||
this.removeMsTouchListener(obj, type, id);
|
||||
} else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {
|
||||
@ -6259,11 +6272,7 @@ L.DomEvent = {
|
||||
|
||||
} else if ('removeEventListener' in obj) {
|
||||
|
||||
if (type === 'mousewheel') {
|
||||
obj.removeEventListener('DOMMouseScroll', handler, false);
|
||||
obj.removeEventListener(type, handler, false);
|
||||
|
||||
} else if ((type === 'mouseenter') || (type === 'mouseleave')) {
|
||||
if ((type === 'mouseenter') || (type === 'mouseleave')) {
|
||||
obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
|
||||
} else {
|
||||
obj.removeEventListener(type, handler, false);
|
||||
@ -6325,15 +6334,16 @@ L.DomEvent = {
|
||||
},
|
||||
|
||||
getWheelDelta: function (e) {
|
||||
|
||||
var delta = 0;
|
||||
|
||||
if (e.wheelDelta) {
|
||||
if (e.type === 'wheel') {
|
||||
delta = -e.deltaY / (e.deltaMode ? 1 : 120);
|
||||
} else if (e.type === 'mousewheel') {
|
||||
delta = e.wheelDelta / 120;
|
||||
} else if (e.type === 'MozMousePixelScroll') {
|
||||
delta = -e.detail;
|
||||
}
|
||||
if (e.detail) {
|
||||
delta = -e.detail / 3;
|
||||
}
|
||||
|
||||
return delta;
|
||||
},
|
||||
|
||||
@ -6742,12 +6752,12 @@ L.Map.mergeOptions({
|
||||
|
||||
L.Map.ScrollWheelZoom = L.Handler.extend({
|
||||
addHooks: function () {
|
||||
L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
|
||||
L.DomEvent.on(this._map._container, 'wheel', this._onWheelScroll, this);
|
||||
this._delta = 0;
|
||||
},
|
||||
|
||||
removeHooks: function () {
|
||||
L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);
|
||||
L.DomEvent.off(this._map._container, 'wheel', this._onWheelScroll);
|
||||
},
|
||||
|
||||
_onWheelScroll: function (e) {
|
||||
@ -8106,7 +8116,7 @@ L.Control.Layers = L.Control.extend({
|
||||
|
||||
if (!L.Browser.touch) {
|
||||
L.DomEvent.disableClickPropagation(container);
|
||||
L.DomEvent.on(container, 'mousewheel', L.DomEvent.stopPropagation);
|
||||
L.DomEvent.on(container, 'wheel', L.DomEvent.stopPropagation);
|
||||
} else {
|
||||
L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
|
||||
}
|
||||
|
||||
8
dist/leaflet.js
vendored
8
dist/leaflet.js
vendored
File diff suppressed because one or more lines are too long
@ -2,7 +2,7 @@
|
||||
var oldL = window.L,
|
||||
L = {};
|
||||
|
||||
L.version = '0.6-dev';
|
||||
L.version = '0.6';
|
||||
|
||||
// define Leaflet for Node module pattern loaders, including Browserify
|
||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user