Update Leaflet to 0.6.1

diff --git a/Vendorfile b/Vendorfile
index 3f86bb1844b248c6dcd6cf512895068ab6d3baad..251a478d12e21916a6e2af0efa331dd37a4393d9 100644 (file)
--- a/Vendorfile
+++ b/Vendorfile
@@ -1,6 +1,6 @@
 folder 'vendor/assets' do
   folder 'leaflet' do
 folder 'vendor/assets' do
   folder 'leaflet' do

-    from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.6' do
+    from 'git://github.com/Leaflet/Leaflet.git', :tag => 'v0.6.1' do

       file 'leaflet.css', 'dist/leaflet.css'
       file 'leaflet.ie.css', 'dist/leaflet.ie.css'
       file 'leaflet.js', 'dist/leaflet-src.js'
       file 'leaflet.css', 'dist/leaflet.css'
       file 'leaflet.ie.css', 'dist/leaflet.ie.css'
       file 'leaflet.js', 'dist/leaflet-src.js'

diff --git a/vendor/assets/leaflet/leaflet.css b/vendor/assets/leaflet/leaflet.css
index ddb7e6b8b09d3e36c5be08628ff10a98f00f419a..aee2bb9f750ab8d6c55df5fc00c84b9338a95adb 100644 (file)
--- a/vendor/assets/leaflet/leaflet.css
+++ b/vendor/assets/leaflet/leaflet.css
@@ -197,7 +197,7 @@
        -webkit-border-radius: 4px;\r
                border-radius: 4px;\r
        }\r
        -webkit-border-radius: 4px;\r
                border-radius: 4px;\r
        }\r

-.leaflet-bar a {\r
+.leaflet-bar a, .leaflet-bar a:hover {\r

        background-color: #fff;\r
        border-bottom: 1px solid #ccc;\r
        width: 26px;\r
        background-color: #fff;\r
        border-bottom: 1px solid #ccc;\r
        width: 26px;\r

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index 0795a7de931b2f594a96e9b9e4b495ef6e79f579..8a857c96c016ea9cf779b296b699082da1676a2d 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -7,7 +7,7 @@
 var oldL = window.L,
     L = {};
 
 var oldL = window.L,
     L = {};
 

-L.version = '0.6';
+L.version = '0.6.1';

 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {
 
 // define Leaflet for Node module pattern loaders, including Browserify
 if (typeof module === 'object' && typeof module.exports === 'object') {


@@ -2335,7 +2335,7 @@ L.Projection.Mercator = {
                    lng = point.x * d / r,
                    tmp = r2 / r,
                    eccent = Math.sqrt(1 - (tmp * tmp)),
                    lng = point.x * d / r,
                    tmp = r2 / r,
                    eccent = Math.sqrt(1 - (tmp * tmp)),

-                   ts = Math.exp(- point.y / r2),
+                   ts = Math.exp(- point.y / r),

                    phi = (Math.PI / 2) - 2 * Math.atan(ts),
                    numIter = 15,
                    tol = 1e-7,
                    phi = (Math.PI / 2) - 2 * Math.atan(ts),
                    numIter = 15,
                    tol = 1e-7,


@@ -3903,7 +3903,7 @@ L.Popup = L.Class.extend({
                L.DomEvent.disableClickPropagation(wrapper);
 
                this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);
                L.DomEvent.disableClickPropagation(wrapper);
 
                this._contentNode = L.DomUtil.create('div', prefix + '-content', wrapper);

-               L.DomEvent.on(this._contentNode, 'wheel', L.DomEvent.stopPropagation);
+               L.DomEvent.on(this._contentNode, 'mousewheel', 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);
                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);


@@ -6190,11 +6190,6 @@ L.geoJson = function (geojson, options) {
  */
 
 L.DomEvent = {
  */
 
 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])
 
        /* inspired by John Resig, Dean Edwards and YUI addEvent implementations */
        addListener: function (obj, type, fn, context) { // (HTMLElement, String, Function[, Object])
 


@@ -6215,13 +6210,13 @@ L.DomEvent = {
                        this.addDoubleTapListener(obj, handler, id);
                }
 
                        this.addDoubleTapListener(obj, handler, id);
                }
 

-               if (type === 'wheel' || type === 'mousewheel') {
-                       type = L.DomEvent.WHEEL;
-               }
-

                if ('addEventListener' in obj) {
 
                if ('addEventListener' in obj) {
 

-                       if ((type === 'mouseenter') || (type === 'mouseleave')) {
+                       if (type === 'mousewheel') {
+                               obj.addEventListener('DOMMouseScroll', handler, false);
+                               obj.addEventListener(type, handler, false);
+
+                       } else if ((type === 'mouseenter') || (type === 'mouseleave')) {

 
                                originalHandler = handler;
                                newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');
 
                                originalHandler = handler;
                                newType = (type === 'mouseenter' ? 'mouseover' : 'mouseout');


@@ -6261,10 +6256,6 @@ L.DomEvent = {
 
                if (!handler) { return this; }
 
 
                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) {
                if (L.Browser.msTouch && type.indexOf('touch') === 0) {
                        this.removeMsTouchListener(obj, type, id);
                } else if (L.Browser.touch && (type === 'dblclick') && this.removeDoubleTapListener) {


@@ -6272,7 +6263,11 @@ L.DomEvent = {
 
                } else if ('removeEventListener' in obj) {
 
 
                } else if ('removeEventListener' in obj) {
 

-                       if ((type === 'mouseenter') || (type === 'mouseleave')) {
+                       if (type === 'mousewheel') {
+                               obj.removeEventListener('DOMMouseScroll', handler, false);
+                               obj.removeEventListener(type, handler, false);
+
+                       } else if ((type === 'mouseenter') || (type === 'mouseleave')) {

                                obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
                        } else {
                                obj.removeEventListener(type, handler, false);
                                obj.removeEventListener((type === 'mouseenter' ? 'mouseover' : 'mouseout'), handler, false);
                        } else {
                                obj.removeEventListener(type, handler, false);


@@ -6334,16 +6329,15 @@ L.DomEvent = {
        },
 
        getWheelDelta: function (e) {
        },
 
        getWheelDelta: function (e) {

+

                var delta = 0;
 
                var delta = 0;
 

-               if (e.type === 'wheel') {
-                       delta = -e.deltaY / (e.deltaMode ? 1 : 120);
-               } else if (e.type === 'mousewheel') {
+               if (e.wheelDelta) {

                        delta = e.wheelDelta / 120;
                        delta = e.wheelDelta / 120;

-               } else if (e.type === 'MozMousePixelScroll') {
-                       delta = -e.detail;

                }
                }

-
+               if (e.detail) {
+                       delta = -e.detail / 3;
+               }

                return delta;
        },
 
                return delta;
        },
 


@@ -6764,12 +6758,14 @@ L.Map.mergeOptions({
 
 L.Map.ScrollWheelZoom = L.Handler.extend({
        addHooks: function () {
 
 L.Map.ScrollWheelZoom = L.Handler.extend({
        addHooks: function () {

-               L.DomEvent.on(this._map._container, 'wheel', this._onWheelScroll, this);
+               L.DomEvent.on(this._map._container, 'mousewheel', this._onWheelScroll, this);
+               L.DomEvent.on(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);

                this._delta = 0;
        },
 
        removeHooks: function () {
                this._delta = 0;
        },
 
        removeHooks: function () {

-               L.DomEvent.off(this._map._container, 'wheel', this._onWheelScroll);
+               L.DomEvent.off(this._map._container, 'mousewheel', this._onWheelScroll);
+               L.DomEvent.off(this._map._container, 'MozMousePixelScroll', L.DomEvent.preventDefault);

        },
 
        _onWheelScroll: function (e) {
        },
 
        _onWheelScroll: function (e) {


@@ -8128,7 +8124,7 @@ L.Control.Layers = L.Control.extend({
 
                if (!L.Browser.touch) {
                        L.DomEvent.disableClickPropagation(container);
 
                if (!L.Browser.touch) {
                        L.DomEvent.disableClickPropagation(container);

-                       L.DomEvent.on(container, 'wheel', L.DomEvent.stopPropagation);
+                       L.DomEvent.on(container, 'mousewheel', L.DomEvent.stopPropagation);

                } else {
                        L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
                }
                } else {
                        L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
                }