From 0aac99610aa2dcca7e4d5813c0f0db6df5fe907e Mon Sep 17 00:00:00 2001
From: Arnaud Marant <arnaudmarant@gmail.com>
Date: Thu, 11 Jun 2015 23:17:18 +0200
Subject: [PATCH] Fix nested simple quote issues after a blind double to simple
 quote replace. Fix an issue when a layer component had a length attribute,
 lodash see the object as an array.

---
 example/events.js        | 5 +++--
 example/simple.js        | 2 +-
 example/vector-layers.js | 2 +-
 gulpfile.js              | 2 +-
 src/MapComponent.js      | 5 +++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/example/events.js b/example/events.js
index 8a6cddfc..563d69da 100644
--- a/example/events.js
+++ b/example/events.js
@@ -37,10 +37,11 @@ export default class EventsExample extends Component {
       center={this.state.latlng}
       zoom={13}
       onClick={this.handleClick.bind(this)}
-      onLocationfound={this.handleLocationFound.bind(this)}>
+      onLocationfound={this.handleLocationFound.bind(this)}
+      length={4}>
       <TileLayer
         url='http://{s}.tile.osm.org/{z}/{x}/{y}.png'
-        attribution='&copy; <a href='http://osm.org/copyright'>OpenStreetMap</a> contributors'
+        attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
       />
       {marker}
     </Map>;
diff --git a/example/simple.js b/example/simple.js
index 80b5d8a8..30b91e19 100644
--- a/example/simple.js
+++ b/example/simple.js
@@ -16,7 +16,7 @@ export default class SimpleExample extends Component {
     return <Map center={position} zoom={this.state.zoom}>
       <TileLayer
         url='http://{s}.tile.osm.org/{z}/{x}/{y}.png'
-        attribution='&copy; <a href='http://osm.org/copyright'>OpenStreetMap</a> contributors'
+        attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
       />
       <Marker position={position}>
         <Popup>
diff --git a/example/vector-layers.js b/example/vector-layers.js
index 624f781d..e46d16eb 100644
--- a/example/vector-layers.js
+++ b/example/vector-layers.js
@@ -46,7 +46,7 @@ export default class VectorLayersExample extends Component {
     return <Map center={center} zoom={13}>
       <TileLayer
         url='http://{s}.tile.osm.org/{z}/{x}/{y}.png'
-        attribution='&copy; <a href='http://osm.org/copyright'>OpenStreetMap</a> contributors'
+        attribution='&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
       />
       <Circle center={center} radius={200} fillColor='blue' />
       <CircleMarker center={[51.51, -0.12]} radius={20} color='red'>
diff --git a/gulpfile.js b/gulpfile.js
index cd2c728f..ead4de79 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,7 +15,7 @@ var logTime = function(fileName) {
     var time = ms < 1000
       ? $.util.colors.magenta(ms + ' ms')
       : $.util.colors.magenta(ms / 1000 + ' s');
-    $.util.log('Browserified '' +  name + '' in ' + time);
+    $.util.log('Browserified "' +  name + '" in ' + time);
   };
 };
 
diff --git a/src/MapComponent.js b/src/MapComponent.js
index 84372fd3..5ed9acd2 100644
--- a/src/MapComponent.js
+++ b/src/MapComponent.js
@@ -1,6 +1,7 @@
 import clone from 'lodash/lang/clone';
 import forEach from 'lodash/collection/forEach';
 import reduce from 'lodash/collection/reduce';
+import keys from 'lodash/object/keys';
 import { Component } from 'react';
 
 const EVENTS_RE = /on(?:Leaflet)?(.+)/i;
@@ -11,10 +12,10 @@ export default class MapComponent extends Component {
   }
 
   extractLeafletEvents(props) {
-    return reduce(props, (res, cb, ev) => {
+    return reduce(keys(props), (res, ev) => {
       if (EVENTS_RE.test(ev)) {
         const key = ev.replace(EVENTS_RE, (match, p) => p.toLowerCase());
-        res[ key ] = cb;
+        res[ key ] = props[ev];
       }
       return res;
     }, {});