Merge branch 'master' into redesign

[rails.git] / vendor / assets / leaflet / leaflet.js

diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js
index b972941d97a06cbb5705ce998d7382fa682e355c..0f0b01be2a587f901b9464cce071d2cc191529ba 100644 (file)
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@ -1704,7 +1704,7 @@ L.Map = L.Class.extend({
        removeLayer: function (layer) {
                var id = L.stamp(layer);
 
-               if (!this._layers[id]) { return; }
+               if (!this._layers[id]) { return this; }
 
                if (this._loaded) {
                        layer.onRemove(this);
@@ -1773,11 +1773,7 @@ L.Map = L.Class.extend({
                                this._rawPanBy(offset);
                        }
 
-                       this.fire('move');
-
-                       // make sure moveend is not fired too often on resize
-                       clearTimeout(this._sizeTimer);
-                       this._sizeTimer = setTimeout(L.bind(this.fire, this, 'moveend'), 200);
+                       this.fire('move').fire('moveend');
                }
 
                return this.fire('resize', {