fix(src): eslint errors

tomchentw · May 30, 2016 · f2b242a · f2b242a
1 parent 89f7d12
commit f2b242a
Show file tree

Hide file tree

Showing 40 changed files with 404 additions and 202 deletions.
diff --git a/src/Circle.js b/src/Circle.js
@@ -35,7 +35,8 @@ export default class Circle extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Circle
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getBounds() { return this.state.circle.getBounds(); }
 
   getCenter() { return this.state.circle.getCenter(); }

diff --git a/src/DirectionsRenderer.js b/src/DirectionsRenderer.js
@@ -39,7 +39,8 @@ export default class DirectionsRenderer extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DirectionsRenderer
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getDirections() { return this.state.directionsRenderer.getDirections(); }
 
   getPanel() { return this.state.directionsRenderer.getPanel(); }
@@ -69,7 +70,10 @@ export default class DirectionsRenderer extends Component {
   render() {
     if (this.state.directionsRenderer) {
       return (
-        <DirectionsRendererCreator directionsRenderer={this.state.directionsRenderer} {...this.props}>
+        <DirectionsRendererCreator
+          directionsRenderer={this.state.directionsRenderer}
+          {...this.props}
+        >
           {this.props.children}
         </DirectionsRendererCreator>
       );

diff --git a/src/DrawingManager.js b/src/DrawingManager.js
@@ -39,7 +39,8 @@ export default class DrawingManager extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#DrawingManager
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getDrawingMode() { return this.state.drawingManager.getDrawingMode(); }
   // END - Public APIs
   //
@@ -65,7 +66,10 @@ export default class DrawingManager extends Component {
   render() {
     if (this.state.drawingManager) {
       return (
-        <DrawingManagerCreator drawingManager={this.state.drawingManager} {...this.props}>
+        <DrawingManagerCreator
+          drawingManager={this.state.drawingManager}
+          {...this.props}
+        >
           {this.props.children}
         </DrawingManagerCreator>
       );

diff --git a/src/GoogleMap.js b/src/GoogleMap.js
@@ -38,7 +38,8 @@ export default class GoogleMap extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Map
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
   getBounds() { return (this.props.map || this.refs.delegate).getBounds(); }
 
   getCenter() { return (this.props.map || this.refs.delegate).getCenter(); }
@@ -65,14 +66,17 @@ export default class GoogleMap extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Map
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return !it.match(/^get/) && !it.match(/^set/) && !it.match(/Map$/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return !it.match(/^get/) && !it.match(/^set/) && !it.match(/Map$/); })
   fitBounds(bounds) { return (this.props.map || this.refs.delegate).fitBounds(bounds); }
 
   panBy(x, y) { return (this.props.map || this.refs.delegate).panBy(x, y); }
 
   panTo(latLng) { return (this.props.map || this.refs.delegate).panTo(latLng); }
 
-  panToBounds(latLngBounds) { return (this.props.map || this.refs.delegate).panToBounds(latLngBounds); }
+  panToBounds(latLngBounds) {
+    return (this.props.map || this.refs.delegate).panToBounds(latLngBounds);
+  }
   // END - Public APIs - Use this carefully
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Map
@@ -82,8 +86,9 @@ export default class GoogleMap extends Component {
     const isUsingNewBehavior = USE_NEW_BEHAVIOR_TAG_NAME === containerTagName;
 
     warning(isUsingNewBehavior,
-`"GoogleMap" with containerTagName is deprecated now and will be removed in next major release (5.0.0).
-Use "GoogleMapLoader" instead. See https://github.com/tomchentw/react-google-maps/pull/157 for more details.`
+`"GoogleMap" with containerTagName is deprecated now and will be removed in
+ next major release (5.0.0). Use "GoogleMapLoader" instead.
+See https://github.com/tomchentw/react-google-maps/pull/157 for more details.`
     );
   }
 
@@ -97,8 +102,12 @@ Use "GoogleMapLoader" instead. See https://github.com/tomchentw/react-google-map
           {children}
         </GoogleMapHolder>
       );
-    } else {// ------------ Deprecated ------------
-      const realContainerTagName = (containerTagName === undefined || containerTagName === null) ? `div` : containerTagName;
+    } else { // ------------ Deprecated ------------
+      const realContainerTagName = (
+        (containerTagName === undefined || containerTagName === null)
+        ? `div`
+        : containerTagName
+      );
 
       return (
         <GoogleMapLoader

diff --git a/src/GoogleMapLoader.js b/src/GoogleMapLoader.js
@@ -13,7 +13,9 @@ const USE_NEW_BEHAVIOR_TAG_NAME = `__new_behavior__`;/* CIRCULAR_DEPENDENCY */
 export default class GoogleMapLoader extends Component {
   static propTypes = {
     containerElement: PropTypes.node.isRequired,
-    googleMapElement: PropTypes.element.isRequired, /* CIRCULAR_DEPENDENCY. Uncomment when 5.0.0 comes: propTypesElementOfType(GoogleMap).isRequired, */
+    /* CIRCULAR_DEPENDENCY. Uncomment when 5.0.0 comes:
+    propTypesElementOfType(GoogleMap).isRequired, */
+    googleMapElement: PropTypes.element.isRequired,
   };
 
   static defaultProps = {
@@ -28,12 +30,15 @@ export default class GoogleMapLoader extends Component {
     if (this.state.map || domEl === null) {
       return;
     }
-    const { children, ...mapProps } = this.props.googleMapElement.props;
+    const {
+      children, // eslint-disable-line no-unused-vars
+      ...restProps,
+    } = this.props.googleMapElement.props;
     //
     // Create google.maps.Map instance so that dom is initialized before
     // React's children creators.
     //
-    const map = GoogleMapHolder._createMap(domEl, mapProps);
+    const map = GoogleMapHolder._createMap(domEl, restProps);
     this.setState({ map });
   }
 

diff --git a/src/InfoWindow.js b/src/InfoWindow.js
@@ -35,7 +35,8 @@ export default class InfoWindow extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#InfoWindow
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getContent() { /* TODO: children */ }
 
   getPosition() { return this.state.infoWindow.getPosition(); }

diff --git a/src/KmlLayer.js b/src/KmlLayer.js
@@ -35,7 +35,8 @@ export default class KmlLayer extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#KmlLayer
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
   getDefaultViewport() { return this.state.kmlLayer.getDefaultViewport(); }
 
   getMetadata() { return this.state.kmlLayer.getMetadata(); }

diff --git a/src/Marker.js b/src/Marker.js
@@ -35,7 +35,8 @@ export default class Marker extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Marker
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
   getAnimation() { return this.state.marker.getAnimation(); }
 
   getAttribution() { return this.state.marker.getAttribution(); }

diff --git a/src/OverlayView.js b/src/OverlayView.js
@@ -47,7 +47,8 @@ export default class OverlayView extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#OverlayView
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getPanes() { return this.state.overlayView.getPanes(); }
 
   getProjection() { return this.state.overlayView.getProjection(); }
@@ -71,7 +72,10 @@ export default class OverlayView extends Component {
     const { mapHolderRef } = this.context;
     if (this.state.overlayView) {
       return (
-        <OverlayViewCreator mapHolderRef={mapHolderRef} overlayView={this.state.overlayView} {...this.props}>
+        <OverlayViewCreator
+          mapHolderRef={mapHolderRef}
+          overlayView={this.state.overlayView} {...this.props}
+        >
           {this.props.children}
         </OverlayViewCreator>
       );

diff --git a/src/Polygon.js b/src/Polygon.js
@@ -34,7 +34,8 @@ export default class Polygon extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Polygon
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getDraggable() { return this.state.polygon.getDraggable(); }
 
   getEditable() { return this.state.polygon.getEditable(); }

diff --git a/src/Polyline.js b/src/Polyline.js
@@ -35,7 +35,8 @@ export default class Polyline extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Polyline
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getDraggable() { return this.state.polyline.getDraggable(); }
 
   getEditable() { return this.state.polyline.getEditable(); }

diff --git a/src/Rectangle.js b/src/Rectangle.js
@@ -39,7 +39,8 @@ export default class Rectangle extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#Rectangle
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getBounds() { return this.state.rectangle.getBounds(); }
 
   getDraggable() { return this.state.rectangle.getDraggable(); }

diff --git a/src/SearchBox.js b/src/SearchBox.js
@@ -39,7 +39,8 @@ export default class SearchBox extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference#SearchBox
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/Map$/); })
   getBounds() { return this.state.searchBox.getBounds(); }
 
   getPlaces() { return this.state.searchBox.getPlaces(); }
@@ -55,20 +56,20 @@ export default class SearchBox extends Component {
     }
     const { classes, style, placeholder, ...searchBoxProps } = this.props;
 
-    // Cannot create input via component - Google Maps will mess with React's internal state by detaching/attaching.
+    // Cannot create input via component - Google Maps will mess with React's internal state
+    // by detaching/attaching.
     // Allow developers to style the "hidden element" via inputClasses.
     const domEl = document.createElement(`input`);
     domEl.className = classes;
     domEl.type = `text`;
     domEl.placeholder = placeholder;
 
-    for (const propKey in style) {
-      if (style.hasOwnProperty(propKey)) {
-        domEl.style[propKey] = style[propKey];
-      }
-    }
+    Object.assign(domEl.style, style);
 
-    const searchBox = SearchBoxCreator._createSearchBox(domEl, searchBoxProps);
+    const searchBox = SearchBoxCreator._createSearchBox(
+      domEl,
+      searchBoxProps
+    );
 
     this.setState({
       inputElement: domEl,
@@ -81,7 +82,13 @@ export default class SearchBox extends Component {
     const { mapHolderRef } = this.context;
 
     return this.state.searchBox ? (
-      <SearchBoxCreator controlPosition={controlPosition} inputElement={this.state.inputElement} mapHolderRef={mapHolderRef} searchBox={this.state.searchBox} {...this.props}>
+      <SearchBoxCreator
+        controlPosition={controlPosition}
+        inputElement={this.state.inputElement}
+        mapHolderRef={mapHolderRef}
+        searchBox={this.state.searchBox}
+        {...this.props}
+      >
         {this.props.children}
       </SearchBoxCreator>
     ) : (<noscript />);

diff --git a/src/_Skeleton.js b/src/_Skeleton.js
@@ -13,7 +13,7 @@ import {
   skeletonDefaultPropTypes,
   skeletonControlledPropTypes,
   skeletonEventPropTypes,
-} from "./creators/SkeletonCreator";
+} from "./creators/_SkeletonCreator";
 
 import GoogleMapHolder from "./creators/GoogleMapHolder";
 
@@ -35,7 +35,8 @@ export default class Skeleton extends Component {
   //
   // https://developers.google.com/maps/documentation/javascript/3.exp/reference
   //
-  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; }).filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
+  // [].map.call($0.querySelectorAll("tr>td>code"), function(it){ return it.textContent; })
+  //    .filter(function(it){ return it.match(/^get/) && !it.match(/^getMap/); })
   getAnimation() { return this.state.skeleton.getAnimation(); }
   // END - Public APIs
   //

diff --git a/src/__mocks__/google.maps.mock.js b/src/__mocks__/google.maps.mock.js
@@ -2,6 +2,8 @@ import * as event from "./google.maps.event.mock";
 
 export class Map {
   constructor(domEl, options) {
+    this.domEl = domEl;
+    this.options = options;
   }
 
   setOptions(nextOptions) {

diff --git a/src/addons/MarkerClusterer.js b/src/addons/MarkerClusterer.js
@@ -67,13 +67,21 @@ export default class MarkerClusterer extends Component {
   getZoomOnClick() { return this.state.markerClusterer.getZoomOnClick(); }
 
   // Public APIs - Use this carefully
-  addMarker(marker, nodraw = false) { return this.state.markerClusterer.addMarker(marker, nodraw); }
+  addMarker(marker, nodraw = false) {
+    return this.state.markerClusterer.addMarker(marker, nodraw);
+  }
 
-  addMarkers(markers, nodraw = false) { return this.state.markerClusterer.addMarkers(markers, nodraw); }
+  addMarkers(markers, nodraw = false) {
+    return this.state.markerClusterer.addMarkers(markers, nodraw);
+  }
 
-  removeMarker(marker, nodraw = false) { return this.state.markerClusterer.removeMarker(marker, nodraw); }
+  removeMarker(marker, nodraw = false) {
+    return this.state.markerClusterer.removeMarker(marker, nodraw);
+  }
 
-  removeMarkers(markers, nodraw = false) { return this.state.markerClusterer.removeMarkers(markers, nodraw); }
+  removeMarkers(markers, nodraw = false) {
+    return this.state.markerClusterer.removeMarkers(markers, nodraw);
+  }
 
   clearMarkers() { return this.state.markerClusterer.clearMarkers(); }
 
@@ -88,18 +96,19 @@ export default class MarkerClusterer extends Component {
       return;
     }
 
-    const { ...markerClustererProps } = this.props;
-    const { mapHolderRef } = this.context;
-    const markerClusterer = MarkerClustererCreator._createMarkerClusterer(mapHolderRef, markerClustererProps);
+    const markerClusterer = MarkerClustererCreator._createMarkerClusterer(
+      this.context.mapHolderRef,
+      this.props
+    );
 
     this.setState({ markerClusterer });
   }
 
   render() {
     if (this.state.markerClusterer) {
       return (
-        <MarkerClustererCreator markerClusterer={ this.state.markerClusterer } { ...this.props }>
-          { this.props.children }
+        <MarkerClustererCreator markerClusterer={this.state.markerClusterer} { ...this.props }>
+          {this.props.children}
         </MarkerClustererCreator>
       );
     } else {