leaflet-rails 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2eb78713472675e95e253b537d1546f4544ebd9
-  data.tar.gz: e35af587a0284da1b5c60143fb8970864c547d1a
+  metadata.gz: bf01f44ecedf015f090bdba9dbff3406f05ecfae
+  data.tar.gz: a0607e4587fd7e71c7eb8927ed486a6589c8e3f6
 SHA512:
-  metadata.gz: a644f995dedb93ce3a620f8688c3cfb078b14030ee50b53b5794660761fbeed0d7de8bdcbe4c9ce56f068c0d3197b94da50a538c2a41989a651b6b496a0e7d66
-  data.tar.gz: 2fbda3b24c04f36bbdac8aed3b05f72fa8ad576996fe3f19c6ec79a409a01fdd0a5fbf258560d4c91499512f0b12a26f7443e71b63dcd42e217605ce6cb028db
+  metadata.gz: f5557c3697b9aa7d5deca1e57a2b80ce5f81ee884be32e10ed6881ba1aebd6994c566b5baa83aceabda319b421918d50fa4a2a87adc802f5c53baeff0ca5c190
+  data.tar.gz: 6f0a93e1719f7b1567803dbb0fed12a8c6109197c338275ce789e02accd3dd56ae3b639c02cd0084615f97c88a2cc6ab10055dbc5b25218c761230852825d7f2

data/.travis.yml

@@ -1,11 +1,12 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
   - ruby-head
   - jruby-head
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 matrix:
   allow_failures:
     - rvm: ruby-head

data/README.md

@@ -26,15 +26,6 @@ After that, open your application-wide Javascript file (typically `app/assets/ja
 
 At this point, you may skip the first two steps of the [Leaflet Quick Start guide](http://leafletjs.com/examples/quick-start.html) and start at the third step (adding the map `div` to a view).
 
-*Rails 4.1+*
-
-If you are using Rails 4.1+ you will need to open your application-wide CSS file (`app/assets/stylesheets/application.css`) and add the following lines at the top:
-
-```
-//= depend_on_asset "layers.png"
-//= depend_on_asset "layers-2x.png"
-```
-
 
 Version Parity
 ==============
@@ -45,6 +36,8 @@ leaflet-rails tries to keep version parity with leaflet.js. However, this isn't
 | ------------- | ------------- | ------|
 | 0.7.4  | 0.7.3  | Requested in #33 because of large gap between master and rubygems.org.|
 | 0.7.5  | 0.7.5  | leaflet.js 0.7.4 was reverted. |
+| 0.7.6  | ----   | Skipped to sync with upstream. |
+| 0.7.7  | 0.7.7  | Sync version numbers with upstream. |
 
 
 Helpers

data/lib/leaflet-rails/version.rb

@@ -1,5 +1,5 @@
 module Leaflet
   module Rails
-    VERSION = "0.7.5"
+    VERSION = "0.7.7"
   end
 end

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

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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leaflet-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Akshay Joshi