leaflet-rails 0.6.0 → 0.6.1

data/lib/leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module Leaflet
   module Rails
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/vendor/assets/javascripts/leaflet.js.erb

@@ -7,7 +7,7 @@
 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') {
@@ -2335,7 +2335,7 @@ L.Projection.Mercator = {
 		    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,
@@ -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, '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);
@@ -6190,11 +6190,6 @@ 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])
 
@@ -6215,13 +6210,13 @@ L.DomEvent = {
 			this.addDoubleTapListener(obj, handler, id);
 		}
 
-		if (type === 'wheel' || type === 'mousewheel') {
-			type = L.DomEvent.WHEEL;
-		}
-
 		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');
@@ -6261,10 +6256,6 @@ 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) {
@@ -6272,7 +6263,11 @@ L.DomEvent = {
 
 		} 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);
@@ -6334,16 +6329,15 @@ L.DomEvent = {
 	},
 
 	getWheelDelta: function (e) {
+
 		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;
-		} else if (e.type === 'MozMousePixelScroll') {
-			delta = -e.detail;
 		}
-
+		if (e.detail) {
+			delta = -e.detail / 3;
+		}
 		return delta;
 	},
 
@@ -6764,12 +6758,14 @@ L.Map.mergeOptions({
 
 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 () {
-		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) {
@@ -8128,7 +8124,7 @@ L.Control.Layers = L.Control.extend({
 
 		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);
 		}

data/vendor/assets/stylesheets/leaflet.css.erb

@@ -5,6 +5,7 @@
 .leaflet-marker-icon,
 .leaflet-marker-shadow,
 .leaflet-tile-pane,
+.leaflet-tile-container,
 .leaflet-overlay-pane,
 .leaflet-shadow-pane,
 .leaflet-marker-pane,
@@ -27,6 +28,7 @@
     -webkit-user-select: none;
        -moz-user-select: none;
             user-select: none;
+    -webkit-user-drag: none;
     }
 .leaflet-marker-icon,
 .leaflet-marker-shadow {
@@ -191,104 +193,108 @@
 /* general toolbar styles */
 
 .leaflet-bar {
-    box-shadow: 0 0 8px rgba(0,0,0,0.4);
-    border: 1px solid #888;
-    -webkit-border-radius: 5px;
-            border-radius: 5px;
+    box-shadow: 0 1px 7px rgba(0,0,0,0.65);
+    -webkit-border-radius: 4px;
+            border-radius: 4px;
     }
-.leaflet-bar-part {
-    background-color: rgba(255, 255, 255, 0.8);
-    border-bottom: 1px solid #aaa;
+.leaflet-bar a, .leaflet-bar a:hover {
+    background-color: #fff;
+    border-bottom: 1px solid #ccc;
+    width: 26px;
+    height: 26px;
+    line-height: 26px;
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    color: black;
     }
-.leaflet-bar-part-top {
-    -webkit-border-radius: 4px 4px 0 0;
-            border-radius: 4px 4px 0 0;
+.leaflet-bar a,
+.leaflet-control-layers-toggle {
+    background-position: 50% 50%;
+    background-repeat: no-repeat;
+    display: block;
     }
-.leaflet-bar-part-bottom {
-    -webkit-border-radius: 0 0 4px 4px;
-            border-radius: 0 0 4px 4px;
+.leaflet-bar a:hover {
+    background-color: #f4f4f4;
+    }
+.leaflet-bar a:first-child {
+    -webkit-border-top-left-radius: 4px;
+            border-top-left-radius: 4px;
+    -webkit-border-top-right-radius: 4px;
+            border-top-right-radius: 4px;
+    }
+.leaflet-bar a:last-child {
+    -webkit-border-bottom-left-radius: 4px;
+            border-bottom-left-radius: 4px;
+    -webkit-border-bottom-right-radius: 4px;
+            border-bottom-right-radius: 4px;
     border-bottom: none;
     }
+.leaflet-bar a.leaflet-disabled {
+    cursor: default;
+    background-color: #f4f4f4;
+    color: #bbb;
+    }
 
 .leaflet-touch .leaflet-bar {
     -webkit-border-radius: 10px;
             border-radius: 10px;
     }
-.leaflet-touch .leaflet-bar-part {
-    border-bottom: 4px solid rgba(0,0,0,0.3);
-    }
-.leaflet-touch .leaflet-bar-part-top {
-    -webkit-border-radius: 7px 7px 0 0;
-            border-radius: 7px 7px 0 0;
+.leaflet-touch .leaflet-bar a {
+    width: 30px;
+    height: 30px;
     }
-.leaflet-touch .leaflet-bar-part-bottom {
-    -webkit-border-radius: 0 0 7px 7px;
-            border-radius: 0 0 7px 7px;
+.leaflet-touch .leaflet-bar a:first-child {
+    -webkit-border-top-left-radius: 7px;
+            border-top-left-radius: 7px;
+    -webkit-border-top-right-radius: 7px;
+            border-top-right-radius: 7px;
+    }
+.leaflet-touch .leaflet-bar a:last-child {
+    -webkit-border-bottom-left-radius: 7px;
+            border-bottom-left-radius: 7px;
+    -webkit-border-bottom-right-radius: 7px;
+            border-bottom-right-radius: 7px;
     border-bottom: none;
     }
 
 
 /* zoom control */
 
-.leaflet-container .leaflet-control-zoom {
-    margin-left: 13px;
-    margin-top: 12px;
-    }
-.leaflet-control-zoom a {
-    width: 22px;
-    height: 22px;
-    text-align: center;
-    text-decoration: none;
-    color: black;
-    }
-.leaflet-control-zoom a,
-.leaflet-control-layers-toggle {
-    background-position: 50% 50%;
-    background-repeat: no-repeat;
-    display: block;
-    }
-.leaflet-control-zoom a:hover {
-    background-color: #fff;
-    color: #777;
-    }
 .leaflet-control-zoom-in {
-    font: bold 18px/24px Arial, Helvetica, sans-serif;
+    font: bold 18px 'Lucida Console', Monaco, monospace;
     }
 .leaflet-control-zoom-out {
-    font: bold 23px/20px Tahoma, Verdana, sans-serif;
-    }
-.leaflet-control-zoom a.leaflet-control-zoom-disabled {
-    cursor: default;
-    background-color: rgba(255, 255, 255, 0.8);
-    color: #bbb;
+    font: bold 22px 'Lucida Console', Monaco, monospace;
     }
 
-.leaflet-touch .leaflet-control-zoom a {
-    width: 30px;
-    height: 30px;
-    }
 .leaflet-touch .leaflet-control-zoom-in {
-    font-size: 24px;
-    line-height: 29px;
+    font-size: 22px;
+    line-height: 30px;
     }
 .leaflet-touch .leaflet-control-zoom-out {
     font-size: 28px;
-    line-height: 24px;
+    line-height: 30px;
     }
 
+
 /* layers control */
 
 .leaflet-control-layers {
     box-shadow: 0 1px 7px rgba(0,0,0,0.4);
     background: #f8f8f9;
-    -webkit-border-radius: 8px;
-            border-radius: 8px;
+    -webkit-border-radius: 5px;
+            border-radius: 5px;
     }
 .leaflet-control-layers-toggle {
     background-image: url(<%= asset_path 'layers.png' %>);
     width: 36px;
     height: 36px;
     }
+.leaflet-retina .leaflet-control-layers-toggle {
+    background-image: url(<%= asset_path 'layers-2x.png' %>);
+    background-size: 26px 26px;
+    }
 .leaflet-touch .leaflet-control-layers-toggle {
     width: 44px;
     height: 44px;
@@ -386,11 +392,11 @@
 .leaflet-popup-content-wrapper {
     padding: 1px;
     text-align: left;
-    -webkit-border-radius: 20px;
-            border-radius: 20px;
+    -webkit-border-radius: 12px;
+            border-radius: 12px;
     }
 .leaflet-popup-content {
-    margin: 14px 20px;
+    margin: 13px 19px;
     line-height: 1.4;
     }
 .leaflet-popup-content p {
@@ -404,11 +410,11 @@
     overflow: hidden;
     }
 .leaflet-popup-tip {
-    width: 15px;
-    height: 15px;
+    width: 17px;
+    height: 17px;
     padding: 1px;
 
-    margin: -8px auto 0;
+    margin: -10px auto 0;
 
     -webkit-transform: rotate(45deg);
        -moz-transform: rotate(45deg);
@@ -425,7 +431,7 @@
     position: absolute;
     top: 0;
     right: 0;
-    padding: 4px 5px 0 0;
+    padding: 4px 4px 0 0;
     text-align: center;
     width: 18px;
     height: 14px;

data/vendor/assets/stylesheets/leaflet.ie.css

@@ -35,12 +35,6 @@
 .leaflet-control-layers {
 	border: 3px solid #999;
 	}
-.leaflet-control-zoom a {
-	background-color: #eee;
-	}
-.leaflet-control-zoom a:hover {
-	background-color: #fff;
-	}
 .leaflet-control-layers-toggle {
 	}
 .leaflet-control-attribution,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies: []
 description: This gem provides the leaflet.js map display library for your Rails 3
   application.