Skip to content

Commit 1f011b3

Browse files
metagrovermetagrover
committed
Merge branch 'dev'
2 parents eea8632 + da68eeb commit 1f011b3

31 files changed

+164
-150
lines changed

‎app/actuators/ReactiveMap.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -577,17 +577,17 @@ export default class ReactiveMap extends Component {
577577
const cx = classNames({
578578
"rbc-title-active": this.props.title,
579579
"rbc-title-inactive": !this.props.title
580-
});
580+
}, this.props.className);
581581

582582
return (
583-
<div className={`rbc rbc-reactivemap col s12 col-xs-12 card thumbnail ${cx}`} style={ReactiveMapHelper.mapPropsStyles(this.props.componentStyle, "component")}>
583+
<div className={`rbc rbc-reactivemap col s12 col-xs-12 card thumbnail ${cx}`} style={ReactiveMapHelper.mapPropsStyles(this.props.style, "component")}>
584584
{title}
585585
{showMapStyles}
586586
<GoogleMapLoader
587587
containerElement={
588588
<div
589589
className="rbc-container col s12 col-xs-12"
590-
style={ReactiveMapHelper.mapPropsStyles(this.props.componentStyle, "map", this.mapDefaultHeight)}
590+
style={ReactiveMapHelper.mapPropsStyles(this.props.style, "map", this.mapDefaultHeight)}
591591
/>
592592
}
593593
googleMapElement={
@@ -651,7 +651,7 @@ ReactiveMap.propTypes = {
651651
size: helper.sizeValidation,
652652
from: ReactiveMapHelper.validation.fromValidation,
653653
autoMapRender: React.PropTypes.bool,
654-
componentStyle: React.PropTypes.object,
654+
style: React.PropTypes.object,
655655
autoCenter: React.PropTypes.bool,
656656
showSearchAsMove: React.PropTypes.bool,
657657
setSearchAsMove: React.PropTypes.bool,
@@ -676,7 +676,8 @@ ReactiveMap.propTypes = {
676676
markerOnDblclick: React.PropTypes.func,
677677
onMouseover: React.PropTypes.func,
678678
onMouseout: React.PropTypes.func,
679-
showMapStyles: React.PropTypes.bool
679+
showMapStyles: React.PropTypes.bool,
680+
className: React.PropTypes.string
680681
};
681682

682683
ReactiveMap.defaultProps = {
@@ -695,7 +696,7 @@ ReactiveMap.defaultProps = {
695696
autoMapRender: true,
696697
defaultMarkerImage: "https://opensource.appbase.io/reactivemaps/dist/images/historic-pin.png",
697698
streamMarkerImage: "https://opensource.appbase.io/reactivemaps/dist/images/stream-pin.png",
698-
componentStyle: {},
699+
style: {},
699700
stream: false,
700701
applyGeoQuery: false,
701702
defaultZoom: 13

‎app/sensors/GeoDistanceDropdown.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,10 @@ export default class GeoDistanceDropdown extends Component {
417417
"rbc-title-inactive": !this.props.title,
418418
"rbc-placeholder-active": this.props.placeholder,
419419
"rbc-placeholder-inactive": !this.props.placeholder
420-
});
420+
}, this.props.className);
421421

422422
return (
423-
<div className={`rbc rbc-geodistancedropdown clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.componentStyle}>
423+
<div className={`rbc rbc-geodistancedropdown clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.style}>
424424
<div className="row">
425425
{title}
426426
<div className="rbc-search-container col s12 col-xs-12">
@@ -475,10 +475,11 @@ GeoDistanceDropdown.propTypes = {
475475
),
476476
beforeValueChange: React.PropTypes.func,
477477
onValueChange: React.PropTypes.func,
478-
componentStyle: React.PropTypes.object,
478+
style: React.PropTypes.object,
479479
URLParams: React.PropTypes.bool,
480480
showFilter: React.PropTypes.bool,
481-
filterLabel: React.PropTypes.string
481+
filterLabel: React.PropTypes.string,
482+
className: React.PropTypes.string
482483
};
483484

484485
// Default props value
@@ -487,7 +488,7 @@ GeoDistanceDropdown.defaultProps = {
487488
placeholder: "Search...",
488489
placeholderDropdown: "Select Distance",
489490
autoLocation: true,
490-
componentStyle: {},
491+
style: {},
491492
URLParams: false,
492493
showFilter: true
493494
};
@@ -513,8 +514,9 @@ GeoDistanceDropdown.types = {
513514
customQuery: TYPES.FUNCTION,
514515
beforeValueChange: TYPES.FUNCTION,
515516
onValueChange: TYPES.FUNCTION,
516-
componentStyle: TYPES.OBJECT,
517+
style: TYPES.OBJECT,
517518
URLParams: TYPES.BOOLEAN,
518519
showFilter: TYPES.BOOLEAN,
519-
filterLabel: TYPES.STRING
520+
filterLabel: TYPES.STRING,
521+
className: TYPES.STRING
520522
};

‎app/sensors/GeoDistanceSlider.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,10 @@ export default class GeoDistanceSlider extends Component {
412412
"rbc-placeholder-inactive": !this.props.placeholder,
413413
"rbc-labels-active": this.props.rangeLabels.start || this.props.rangeLabels.end,
414414
"rbc-labels-inactive": !this.props.rangeLabels.start && !this.props.rangeLabels.end
415-
});
415+
}, this.props.className);
416416

417417
return (
418-
<div className={`rbc rbc-geodistanceslider clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.componentStyle}>
418+
<div className={`rbc rbc-geodistanceslider clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.style}>
419419
<div className="row">
420420
{title}
421421
<div className="rbc-search-container col s12 col-xs-12">
@@ -472,10 +472,11 @@ GeoDistanceSlider.propTypes = {
472472
autoLocation: React.PropTypes.bool,
473473
beforeValueChange: React.PropTypes.func,
474474
onValueChange: React.PropTypes.func,
475-
componentStyle: React.PropTypes.object,
475+
style: React.PropTypes.object,
476476
URLParams: React.PropTypes.bool,
477477
showFilter: React.PropTypes.bool,
478-
filterLabel: React.PropTypes.string
478+
filterLabel: React.PropTypes.string,
479+
className: React.PropTypes.string
479480
};
480481

481482
// Default props value
@@ -492,7 +493,7 @@ GeoDistanceSlider.defaultProps = {
492493
end: null
493494
},
494495
autoLocation: true,
495-
componentStyle: {},
496+
style: {},
496497
URLParams: false,
497498
showFilter: true
498499
};
@@ -517,10 +518,11 @@ GeoDistanceSlider.types = {
517518
defaultSelected: TYPES.OBJECT,
518519
placeholder: TYPES.STRING,
519520
customQuery: TYPES.FUNCTION,
520-
componentStyle: TYPES.OBJECT,
521+
style: TYPES.OBJECT,
521522
beforeValueChange: TYPES.FUNCTION,
522523
onValueChange: TYPES.FUNCTION,
523524
URLParams: TYPES.BOOLEAN,
524525
showFilter: TYPES.BOOLEAN,
525-
filterLabel: TYPES.STRING
526+
filterLabel: TYPES.STRING,
527+
className: TYPES.STRING
526528
};

‎app/sensors/PlacesSearch.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ export default class PlacesSearch extends Component {
323323
"rbc-title-inactive": !this.props.title,
324324
"rbc-placeholder-active": this.props.placeholder,
325325
"rbc-placeholder-inactive": !this.props.placeholder
326-
});
326+
}, this.props.className);
327327

328328
return (
329-
<div className={`rbc rbc-placessearch clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.componentStyle}>
329+
<div className={`rbc rbc-placessearch clearfix card thumbnail col s12 col-xs-12 ${cx}`} style={this.props.style}>
330330
<div className="row">
331331
{title}
332332
<div className="col s12 col-xs-12">
@@ -356,17 +356,18 @@ PlacesSearch.propTypes = {
356356
autoLocation: React.PropTypes.bool,
357357
beforeValueChange: React.PropTypes.func,
358358
onValueChange: React.PropTypes.func,
359-
componentStyle: React.PropTypes.object,
359+
style: React.PropTypes.object,
360360
URLParams: React.PropTypes.bool,
361361
showFilter: React.PropTypes.bool,
362362
filterLabel: React.PropTypes.string,
363-
unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"])
363+
unit: React.PropTypes.oneOf(["mi", "miles", "yd", "yards", "ft", "feet", "in", "inch", "km", "kilometers", "m", "meters", "cm", "centimeters", "mm", "millimeters", "NM", "nmi", "nauticalmiles"]),
364+
className: React.PropTypes.string
364365
};
365366
// Default props value
366367
PlacesSearch.defaultProps = {
367368
placeholder: "Search..",
368369
autoLocation: true,
369-
componentStyle: {},
370+
style: {},
370371
URLParams: false,
371372
showFilter: true,
372373
unit: "mi"
@@ -386,9 +387,10 @@ PlacesSearch.types = {
386387
customQuery: TYPES.FUNCTION,
387388
placeholder: TYPES.STRING,
388389
autoLocation: TYPES.BOOLEAN,
389-
componentStyle: TYPES.OBJECT,
390+
style: TYPES.OBJECT,
390391
unit: TYPES.STRING,
391392
URLParams: TYPES.BOOLEAN,
392393
showFilter: TYPES.BOOLEAN,
393-
filterLabel: TYPES.STRING
394+
filterLabel: TYPES.STRING,
395+
className: TYPES.STRING
394396
};

‎dist/CustomQuery.bundle.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/GeoDistanceDropdown.bundle.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/GeoDistanceSlider.bundle.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/PlacesSearch.bundle.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/direction.bundle.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/earthquake.bundle.js‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)