update build and changelog

CHANGELOG.md

@@ -18,6 +18,9 @@ An in-progress version being developed on the master branch.
  * Improved vectors updating/removing on Canvas backend even more (by [@danzel](https://github.com/danzel)). [#961](https://github.com/CloudMade/Leaflet/pull/961)
  * Added `isValid` method to `LatLngBounds` and `Bounds` (by [@domoritz](https://github.com/domoritz)). [#972](https://github.com/CloudMade/Leaflet/pull/972)
  * Improved markers and vectors click event so that it propagates to map if no one is listening to it (by [@danzel](https://github.com/danzel)). [#834](https://github.com/CloudMade/Leaflet/issues/834) [#1033](https://github.com/CloudMade/Leaflet/pull/1033)
+ * Added `Path` `unbindPopup` method.
+ * Added `Path` `remove` event.
+ * Added `Marker` `move` and `remove` events.
 
 ### Bugfixes
 
@@ -31,6 +34,7 @@ An in-progress version being developed on the master branch.
  * Fixed a bug where removing a tile layer while dragging would throw an error (by [@danzel](https://github.com/danzel)). [#965](https://github.com/CloudMade/Leaflet/issues/965) [#968](https://github.com/CloudMade/Leaflet/pull/968)
  * Fixed compatibility with SmoothWheel extension for Firefox (by [@waldir](https://github.com/waldir)). [#1011](https://github.com/CloudMade/Leaflet/pull/1011)
  * Fixed a bug where middle marker wasn't removed after deleting 2 end nodes from a polyline (by [@Svad](https://github.com/Svad)). [#1022](https://github.com/CloudMade/Leaflet/issues/1022) [#1023](https://github.com/CloudMade/Leaflet/pull/1023)
+ * Fixed a bug where `Map` `load` event happened too late (after `moveend`, etc.) (by [@jfirebaugh](https://github.com/jfirebaugh)). [#1027](https://github.com/CloudMade/Leaflet/pull/1027)
 
 ## 0.4.4 (August 7, 2012)
 

dist/leaflet-src.js

@@ -1702,6 +1702,9 @@ L.Map = L.Class.extend({
 
 		this._tileLayersToLoad = this._tileLayersNum;
 
+		var loading = !this._loaded;
+		this._loaded = true;
+
 		this.fire('viewreset', {hard: !preserveMapOffset});
 
 		this.fire('move');
@@ -1712,8 +1715,7 @@ L.Map = L.Class.extend({
 
 		this.fire('moveend', {hard: !preserveMapOffset});
 
-		if (!this._loaded) {
+		if (loading) {
-			this._loaded = true;
 			this.fire('load');
 		}
 	},
@@ -2896,10 +2898,7 @@ L.Marker = L.Class.extend({
 	onRemove: function (map) {
 		this._removeIcon();
 
-		// TODO move to Marker.Popup.js
+		this.fire('remove');
-		if (this.closePopup) {
-			this.closePopup();
-		}
 
 		map.off({
 			'viewreset': this.update,
@@ -2918,9 +2917,7 @@ L.Marker = L.Class.extend({
 
 		this.update();
 
-		if (this._popup) {
+		this.fire('move', { latlng: this._latlng });
-			this._popup.setLatLng(latlng);
-		}
 	},
 
 	setZIndexOffset: function (offset) {
@@ -3414,7 +3411,10 @@ L.Marker.include({
 		options = L.Util.extend({offset: anchor}, options);
 
 		if (!this._popup) {
-			this.on('click', this.openPopup, this);
+			this
+				.on('click', this.openPopup, this)
+				.on('remove', this.closePopup, this)
+				.on('move', this._movePopup, this);
 		}
 
 		this._popup = new L.Popup(options, this)
@@ -3426,9 +3426,16 @@ L.Marker.include({
 	unbindPopup: function () {
 		if (this._popup) {
 			this._popup = null;
-			this.off('click', this.openPopup);
+			this
+				.off('click', this.openPopup)
+				.off('remove', this.closePopup)
+				.off('move', this._movePopup);
 		}
 		return this;
+	},
+
+	_movePopup: function (e) {
+		this._popup.setLatLng(e.latlng);
 	}
 });
 
@@ -3690,6 +3697,8 @@ L.Path = L.Class.extend({
 			this._fill = null;
 		}
 
+		this.fire('remove');
+
 		map.off({
 			'viewreset': this.projectLatlngs,
 			'moveend': this._updatePath
@@ -3846,10 +3855,6 @@ L.Path = L.Path.extend({
 		}
 
 		this._fireMouseEvent(e);
-
-		if (this.hasEventListeners(e.type)) {
-			L.DomEvent.stopPropagation(e);
-		}
 	},
 
 	_fireMouseEvent: function (e) {
@@ -3857,10 +3862,6 @@ L.Path = L.Path.extend({
 			return;
 		}
 
-		if (e.type === 'contextmenu') {
-			L.DomEvent.preventDefault(e);
-		}
-
 		var map = this._map,
 			containerPoint = map.mouseEventToContainerPoint(e),
 			layerPoint = map.containerPointToLayerPoint(containerPoint),
@@ -3872,6 +3873,11 @@ L.Path = L.Path.extend({
 			containerPoint: containerPoint,
 			originalEvent: e
 		});
+
+		if (e.type === 'contextmenu') {
+			L.DomEvent.preventDefault(e);
+		}
+		L.DomEvent.stopPropagation(e);
 	}
 });
 
@@ -3961,14 +3967,26 @@ L.Path.include({
 
 		this._popup.setContent(content);
 
-		if (!this._openPopupAdded) {
+		if (!this._popupHandlersAdded) {
-			this.on('click', this._openPopup, this);
+			this
-			this._openPopupAdded = true;
+				.on('click', this._openPopup, this)
+				.on('remove', this._closePopup, this);
+			this._popupHandlersAdded = true;
 		}
 
 		return this;
 	},
 
+	unbindPopup: function () {
+		if (this._popup) {
+			this._popup = null;
+			this
+				.off('click', this.openPopup)
+				.off('remove', this.closePopup);
+		}
+		return this;
+	},
+
 	openPopup: function (latlng) {
 
 		if (this._popup) {
@@ -3984,6 +4002,10 @@ L.Path.include({
 	_openPopup: function (e) {
 		this._popup.setLatLng(e.latlng);
 		this._map.openPopup(this._popup);
+	},
+
+	_closePopup: function () {
+		this._popup._close();
 	}
 });
 
@@ -6300,16 +6322,20 @@ L.Handler.MarkerDrag = L.Handler.extend({
 	},
 
 	_onDrag: function (e) {
+		var marker = this._marker,
+			shadow = marker._shadow,
+			iconPos = L.DomUtil.getPosition(marker._icon),
+			latlng = marker._map.layerPointToLatLng(iconPos);
+
 		// update shadow position
-		var iconPos = L.DomUtil.getPosition(this._marker._icon);
+		if (shadow) {
-		if (this._marker._shadow) {
+			L.DomUtil.setPosition(shadow, iconPos);
-			L.DomUtil.setPosition(this._marker._shadow, iconPos);
 		}
 
-		this._marker._latlng = this._marker._map.layerPointToLatLng(iconPos);
+		marker._latlng = latlng;
 
-		this._marker
+		marker
-			.fire('move')
+			.fire('move', { latlng: latlng })
 			.fire('drag');
 	},