leaflet-js 0.7.9 → 0.8.dev2

data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/DivIcon.js

@@ -20,18 +20,13 @@ L.DivIcon = L.Icon.extend({
 		var div = (oldIcon && oldIcon.tagName === 'DIV') ? oldIcon : document.createElement('div'),
 		    options = this.options;
 
-		if (options.html !== false) {
-			div.innerHTML = options.html;
-		} else {
-			div.innerHTML = '';
-		}
+		div.innerHTML = options.html !== false ? options.html : '';
 
 		if (options.bgPos) {
-			div.style.backgroundPosition =
-			        (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
+			div.style.backgroundPosition = (-options.bgPos.x) + 'px ' + (-options.bgPos.y) + 'px';
 		}
-
 		this._setIconStyles(div, 'icon');
+
 		return div;
 	},
 

data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Icon.Default.js

@@ -5,11 +5,10 @@
 L.Icon.Default = L.Icon.extend({
 
 	options: {
-		iconSize: [25, 41],
-		iconAnchor: [12, 41],
+		iconSize:    [25, 41],
+		iconAnchor:  [12, 41],
 		popupAnchor: [1, -34],
-
-		shadowSize: [41, 41]
+		shadowSize:  [41, 41]
 	},
 
 	_getIconUrl: function (name) {
@@ -19,17 +18,13 @@ L.Icon.Default = L.Icon.extend({
 			return this.options[key];
 		}
 
-		if (L.Browser.retina && name === 'icon') {
-			name += '-2x';
-		}
-
 		var path = L.Icon.Default.imagePath;
 
 		if (!path) {
 			throw new Error('Couldn\'t autodetect L.Icon.Default.imagePath, set it manually.');
 		}
 
-		return path + '/marker-' + name + '.png';
+		return path + '/marker-' + name + (L.Browser.retina && name === 'icon' ? '-2x' : '') + '.png';
 	}
 });
 
@@ -37,13 +32,12 @@ L.Icon.Default.imagePath = (function () {
 	var scripts = document.getElementsByTagName('script'),
 	    leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;
 
-	var i, len, src, matches, path;
+	var i, len, src, path;
 
 	for (i = 0, len = scripts.length; i < len; i++) {
 		src = scripts[i].src;
-		matches = src.match(leafletRe);
 
-		if (matches) {
+		if (src.match(leafletRe)) {
 			path = src.split(leafletRe)[0];
 			return (path ? path + '/' : '') + 'images';
 		}

data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Icon.js

@@ -3,8 +3,8 @@
  */
 
 L.Icon = L.Class.extend({
+	/*
 	options: {
-		/*
 		iconUrl: (String) (required)
 		iconRetinaUrl: (String) (optional, used for retina devices if detected)
 		iconSize: (Point) (can be set through CSS)
@@ -14,9 +14,9 @@ L.Icon = L.Class.extend({
 		shadowRetinaUrl: (String) (optional, used for retina devices if detected)
 		shadowSize: (Point)
 		shadowAnchor: (Point)
-		*/
-		className: ''
+		className: (String)
 	},
+	*/
 
 	initialize: function (options) {
 		L.setOptions(this, options);
@@ -40,12 +40,7 @@ L.Icon = L.Class.extend({
 			return null;
 		}
 
-		var img;
-		if (!oldIcon || oldIcon.tagName !== 'IMG') {
-			img = this._createImg(src);
-		} else {
-			img = this._createImg(src, oldIcon);
-		}
+		var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null);
 		this._setIconStyles(img, name);
 
 		return img;
@@ -54,19 +49,10 @@ L.Icon = L.Class.extend({
 	_setIconStyles: function (img, name) {
 		var options = this.options,
 		    size = L.point(options[name + 'Size']),
-		    anchor;
-
-		if (name === 'shadow') {
-			anchor = L.point(options.shadowAnchor || options.iconAnchor);
-		} else {
-			anchor = L.point(options.iconAnchor);
-		}
+		    anchor = L.point(name === 'shadow' && options.shadowAnchor || options.iconAnchor ||
+		            size && size.divideBy(2, true));
 
-		if (!anchor && size) {
-			anchor = size.divideBy(2, true);
-		}
-
-		img.className = 'leaflet-marker-' + name + ' ' + options.className;
+		img.className = 'leaflet-marker-' + name + ' ' + (options.className || '');
 
 		if (anchor) {
 			img.style.marginLeft = (-anchor.x) + 'px';
@@ -86,10 +72,7 @@ L.Icon = L.Class.extend({
 	},
 
 	_getIconUrl: function (name) {
-		if (L.Browser.retina && this.options[name + 'RetinaUrl']) {
-			return this.options[name + 'RetinaUrl'];
-		}
-		return this.options[name + 'Url'];
+		return L.Browser.retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url'];
 	}
 });
 

data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Marker.Drag.js

@@ -9,25 +9,27 @@ L.Handler.MarkerDrag = L.Handler.extend({
 
 	addHooks: function () {
 		var icon = this._marker._icon;
+
 		if (!this._draggable) {
 			this._draggable = new L.Draggable(icon, icon);
 		}
 
-		this._draggable
-			.on('dragstart', this._onDragStart, this)
-			.on('drag', this._onDrag, this)
-			.on('dragend', this._onDragEnd, this);
-		this._draggable.enable();
-		L.DomUtil.addClass(this._marker._icon, 'leaflet-marker-draggable');
+		this._draggable.on({
+			dragstart: this._onDragStart,
+			drag: this._onDrag,
+			dragend: this._onDragEnd
+		}, this).enable();
+
+		L.DomUtil.addClass(icon, 'leaflet-marker-draggable');
 	},
 
 	removeHooks: function () {
-		this._draggable
-			.off('dragstart', this._onDragStart, this)
-			.off('drag', this._onDrag, this)
-			.off('dragend', this._onDragEnd, this);
+		this._draggable.off({
+			dragstart: this._onDragStart,
+			drag: this._onDrag,
+			dragend: this._onDragEnd
+		}, this).disable();
 
-		this._draggable.disable();
 		L.DomUtil.removeClass(this._marker._icon, 'leaflet-marker-draggable');
 	},
 

data/lib/leaflet/src/layer/marker/Marker.Popup.js

@@ -0,0 +1,16 @@
+/*
+ * Popup extension to L.Marker, adding popup-related methods.
+ */
+
+L.Marker.include({
+	bindPopup: function (content, options) {
+		var anchor = L.point(this.options.icon.options.popupAnchor || [0, 0])
+			.add(L.Popup.prototype.options.offset);
+
+		options = L.extend({offset: anchor}, options);
+
+		return L.Layer.prototype.bindPopup.call(this, content, options);
+	},
+
+	_openPopup: L.Layer.prototype.togglePopup
+});

data/{vendor/assets/Leaflet → lib/leaflet}/src/layer/marker/Marker.js

@@ -2,20 +2,20 @@
  * L.Marker is used to display clickable/draggable icons on the map.
  */
 
-L.Marker = L.Class.extend({
-
-	includes: L.Mixin.Events,
+L.Marker = L.Layer.extend({
 
 	options: {
+		pane: 'markerPane',
+
 		icon: new L.Icon.Default(),
-		title: '',
-		alt: '',
+		// title: '',
+		// alt: '',
 		clickable: true,
-		draggable: false,
+		// draggable: false,
 		keyboard: true,
 		zIndexOffset: 0,
 		opacity: 1,
-		riseOnHover: false,
+		// riseOnHover: false,
 		riseOffset: 250
 	},
 
@@ -25,40 +25,29 @@ L.Marker = L.Class.extend({
 	},
 
 	onAdd: function (map) {
-		this._map = map;
-
-		map.on('viewreset', this.update, this);
+		this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation;
 
 		this._initIcon();
 		this.update();
-		this.fire('add');
-
-		if (map.options.zoomAnimation && map.options.markerZoomAnimation) {
-			map.on('zoomanim', this._animateZoom, this);
-		}
 	},
 
-	addTo: function (map) {
-		map.addLayer(this);
-		return this;
-	},
-
-	onRemove: function (map) {
+	onRemove: function () {
 		if (this.dragging) {
 			this.dragging.disable();
 		}
 
 		this._removeIcon();
 		this._removeShadow();
+	},
 
-		this.fire('remove');
+	getEvents: function () {
+		var events = {viewreset: this.update};
 
-		map.off({
-			'viewreset': this.update,
-			'zoomanim': this._animateZoom
-		}, this);
+		if (this._zoomAnimated) {
+			events.zoomanim = this._animateZoom;
+		}
 
-		this._map = null;
+		return events;
 	},
 
 	getLatLng: function () {
@@ -66,18 +55,15 @@ L.Marker = L.Class.extend({
 	},
 
 	setLatLng: function (latlng) {
+		var oldLatlng = this._latlng;
 		this._latlng = L.latLng(latlng);
-
 		this.update();
-
-		return this.fire('move', { latlng: this._latlng });
+		return this.fire('move', { oldLatlng: oldLatlng, latlng: this._latlng });
 	},
 
 	setZIndexOffset: function (offset) {
 		this.options.zIndexOffset = offset;
-		this.update();
-
-		return this;
+		return this.update();
 	},
 
 	setIcon: function (icon) {
@@ -97,17 +83,18 @@ L.Marker = L.Class.extend({
 	},
 
 	update: function () {
+
 		if (this._icon) {
-			this._setPos(this._map.latLngToLayerPoint(this._latlng).round());
+			var pos = this._map.latLngToLayerPoint(this._latlng).round();
+			this._setPos(pos);
 		}
+
 		return this;
 	},
 
 	_initIcon: function () {
 		var options = this.options,
-		    map = this._map,
-		    animation = (map.options.zoomAnimation && map.options.markerZoomAnimation),
-		    classToAdd = animation ? 'leaflet-zoom-animated' : 'leaflet-zoom-hide';
+		    classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide');
 
 		var icon = options.icon.createIcon(this._icon),
 			addIcon = false;
@@ -122,7 +109,6 @@ L.Marker = L.Class.extend({
 			if (options.title) {
 				icon.title = options.title;
 			}
-
 			if (options.alt) {
 				icon.alt = options.alt;
 			}
@@ -135,13 +121,13 @@ L.Marker = L.Class.extend({
 		}
 
 		this._icon = icon;
-
 		this._initInteraction();
 
 		if (options.riseOnHover) {
-			L.DomEvent
-				.on(icon, 'mouseover', this._bringToFront, this)
-				.on(icon, 'mouseout', this._resetZIndex, this);
+			L.DomEvent.on(icon, {
+				mouseover: this._bringToFront,
+				mouseout: this._resetZIndex
+			}, this);
 		}
 
 		var newShadow = options.icon.createShadow(this._shadow),
@@ -163,32 +149,30 @@ L.Marker = L.Class.extend({
 		}
 
 
-		var panes = this._map._panes;
-
 		if (addIcon) {
-			panes.markerPane.appendChild(this._icon);
+			this.getPane().appendChild(this._icon);
 		}
-
 		if (newShadow && addShadow) {
-			panes.shadowPane.appendChild(this._shadow);
+			this.getPane('shadowPane').appendChild(this._shadow);
 		}
 	},
 
 	_removeIcon: function () {
 		if (this.options.riseOnHover) {
-			L.DomEvent
-			    .off(this._icon, 'mouseover', this._bringToFront)
-			    .off(this._icon, 'mouseout', this._resetZIndex);
+			L.DomEvent.off(this._icon, {
+				mouseover: this._bringToFront,
+			    mouseout: this._resetZIndex
+			}, this);
 		}
 
-		this._map._panes.markerPane.removeChild(this._icon);
+		L.DomUtil.remove(this._icon);
 
 		this._icon = null;
 	},
 
 	_removeShadow: function () {
 		if (this._shadow) {
-			this._map._panes.shadowPane.removeChild(this._shadow);
+			L.DomUtil.remove(this._shadow);
 		}
 		this._shadow = null;
 	},
@@ -219,18 +203,10 @@ L.Marker = L.Class.extend({
 
 		if (!this.options.clickable) { return; }
 
-		// TODO refactor into something shared with Map/Path/etc. to DRY it up
-
-		var icon = this._icon,
-		    events = ['dblclick', 'mousedown', 'mouseover', 'mouseout', 'contextmenu'];
+		L.DomUtil.addClass(this._icon, 'leaflet-clickable');
 
-		L.DomUtil.addClass(icon, 'leaflet-clickable');
-		L.DomEvent.on(icon, 'click', this._onMouseClick, this);
-		L.DomEvent.on(icon, 'keypress', this._onKeyPress, this);
-
-		for (var i = 0; i < events.length; i++) {
-			L.DomEvent.on(icon, events[i], this._fireMouseEvent, this);
-		}
+		L.DomEvent.on(this._icon, 'click dblclick mousedown mouseup mouseover mouseout contextmenu keypress',
+				this._fireMouseEvent, this);
 
 		if (L.Handler.MarkerDrag) {
 			this.dragging = new L.Handler.MarkerDrag(this);
@@ -241,49 +217,19 @@ L.Marker = L.Class.extend({
 		}
 	},
 
-	_onMouseClick: function (e) {
-		var wasDragged = this.dragging && this.dragging.moved();
-
-		if (this.hasEventListeners(e.type) || wasDragged) {
-			L.DomEvent.stopPropagation(e);
+	_fireMouseEvent: function (e, type) {
+		// to prevent outline when clicking on keyboard-focusable marker
+		if (e.type === 'mousedown') {
+			L.DomEvent.preventDefault(e);
 		}
 
-		if (wasDragged) { return; }
-
-		if ((!this.dragging || !this.dragging._enabled) && this._map.dragging && this._map.dragging.moved()) { return; }
-
-		this.fire(e.type, {
-			originalEvent: e,
-			latlng: this._latlng
-		});
-	},
+		if (e.type === 'click' && this.dragging && this.dragging.moved()) { return; }
 
-	_onKeyPress: function (e) {
-		if (e.keyCode === 13) {
-			this.fire('click', {
-				originalEvent: e,
-				latlng: this._latlng
-			});
+		if (e.type === 'keypress' && e.keyCode === 13) {
+			type = 'click';
 		}
-	},
-
-	_fireMouseEvent: function (e) {
-
-		this.fire(e.type, {
-			originalEvent: e,
-			latlng: this._latlng
-		});
 
-		// TODO proper custom event propagation
-		// this line will always be called if marker is in a FeatureGroup
-		if (e.type === 'contextmenu' && this.hasEventListeners(e.type)) {
-			L.DomEvent.preventDefault(e);
-		}
-		if (e.type !== 'mousedown') {
-			L.DomEvent.stopPropagation(e);
-		} else {
-			L.DomEvent.preventDefault(e);
-		}
+		this._map._fireMouseEvent(this, e, type, true, this._latlng);
 	},
 
 	setOpacity: function (opacity) {
@@ -296,9 +242,12 @@ L.Marker = L.Class.extend({
 	},
 
 	_updateOpacity: function () {
-		L.DomUtil.setOpacity(this._icon, this.options.opacity);
+		var opacity = this.options.opacity;
+
+		L.DomUtil.setOpacity(this._icon, opacity);
+
 		if (this._shadow) {
-			L.DomUtil.setOpacity(this._shadow, this.options.opacity);
+			L.DomUtil.setOpacity(this._shadow, opacity);
 		}
 	},