Merge branch 'dev'

appbaseio · Oct 12, 2017 · 057725a · 057725a
2 parents 684198e + dcdcf98
commit 057725a
Show file tree

Hide file tree

Showing 25 changed files with 61 additions and 61 deletions.
diff --git a/app/sensors/GeoDistanceDropdown.js b/app/sensors/GeoDistanceDropdown.js
@@ -136,7 +136,7 @@ export default class GeoDistanceDropdown extends Component {
 
 			axios.get(`https://maps.googleapis.com/maps/api/geocode/json?latlng=${this.locString}`)
 				.then((res) => {
-					if (res.data.results) {
+					if (Array.isArray(res.data.results) && res.data.results.length) {
 						const userLocation = res.data.results[0].formatted_address;
 						this.setState({
 							userLocation
@@ -214,7 +214,7 @@ export default class GeoDistanceDropdown extends Component {
 		if (value && value !== "") {
 			axios.get(`https://maps.googleapis.com/maps/api/geocode/json?address=${value}`)
 				.then((res) => {
-					if (res.data.results) {
+					if (Array.isArray(res.data.results) && res.data.results.length) {
 						const location = res.data.results[0].geometry.location;
 						this.locString = `${location.lat}, ${location.lng}`;
 						if (cb) {
@@ -394,7 +394,7 @@ export default class GeoDistanceDropdown extends Component {
 						value: place.description
 					});
 				});
-				if (this.state.userLocation.length && this.result.options[0].label !== "Use my current location") {
+				if (this.state.userLocation && this.state.userLocation.length && this.result.options[0].label !== "Use my current location") {
 					this.result.options.unshift({
 						label: "Use my current location",
 						value: this.state.userLocation

diff --git a/app/sensors/GeoDistanceSlider.js b/app/sensors/GeoDistanceSlider.js
@@ -120,7 +120,7 @@ export default class GeoDistanceSlider extends Component {
 
 			axios.get(`https://maps.googleapis.com/maps/api/geocode/json?latlng=${this.locString}`)
 				.then((res) => {
-					if (res.data.results) {
+					if (Array.isArray(res.data.results) && res.data.results.length) {
 						const userLocation = res.data.results[0].formatted_address;
 						this.setState({
 							userLocation
@@ -197,7 +197,7 @@ export default class GeoDistanceSlider extends Component {
 		if (value && value !== "") {
 			axios.get(`https://maps.googleapis.com/maps/api/geocode/json?address=${value}`)
 				.then((res) => {
-					if (res.data.results) {
+					if (Array.isArray(res.data.results) && res.data.results.length) {
 						const location = res.data.results[0].geometry.location;
 						this.locString = `${location.lat}, ${location.lng}`;
 						if (cb) {

diff --git a/dist/CustomQuery.bundle.js b/dist/CustomQuery.bundle.js
diff --git a/dist/GeoDistanceDropdown.bundle.js b/dist/GeoDistanceDropdown.bundle.js
diff --git a/dist/GeoDistanceSlider.bundle.js b/dist/GeoDistanceSlider.bundle.js
diff --git a/dist/PlacesSearch.bundle.js b/dist/PlacesSearch.bundle.js
diff --git a/dist/direction.bundle.js b/dist/direction.bundle.js
diff --git a/dist/earthquake.bundle.js b/dist/earthquake.bundle.js
diff --git a/dist/events.bundle.js b/dist/events.bundle.js
diff --git a/dist/heatmap.bundle.js b/dist/heatmap.bundle.js
diff --git a/dist/list.bundle.js b/dist/list.bundle.js
diff --git a/dist/meetupblast.bundle.js b/dist/meetupblast.bundle.js
diff --git a/dist/nearby.bundle.js b/dist/nearby.bundle.js
diff --git a/dist/now.bundle.js b/dist/now.bundle.js
diff --git a/dist/transport.bundle.js b/dist/transport.bundle.js
diff --git a/dist/weather.bundle.js b/dist/weather.bundle.js
diff --git a/lib/sensors/GeoDistanceDropdown.js b/lib/sensors/GeoDistanceDropdown.js
@@ -159,7 +159,7 @@ var GeoDistanceDropdown = function (_Component) {
 			_this4.locString = location.coords.latitude + ", " + location.coords.longitude;
 
 			axios.get("https://maps.googleapis.com/maps/api/geocode/json?latlng=" + _this4.locString).then(function (res) {
-				if (res.data.results) {
+				if (Array.isArray(res.data.results) && res.data.results.length) {
 					var userLocation = res.data.results[0].formatted_address;
 					_this4.setState({
 						userLocation: userLocation
@@ -243,7 +243,7 @@ var GeoDistanceDropdown = function (_Component) {
 
 		if (value && value !== "") {
 			axios.get("https://maps.googleapis.com/maps/api/geocode/json?address=" + value).then(function (res) {
-				if (res.data.results) {
+				if (Array.isArray(res.data.results) && res.data.results.length) {
 					var location = res.data.results[0].geometry.location;
 					_this7.locString = location.lat + ", " + location.lng;
 					if (cb) {
@@ -423,7 +423,7 @@ var GeoDistanceDropdown = function (_Component) {
 						value: place.description
 					});
 				});
-				if (_this10.state.userLocation.length && _this10.result.options[0].label !== "Use my current location") {
+				if (_this10.state.userLocation && _this10.state.userLocation.length && _this10.result.options[0].label !== "Use my current location") {
 					_this10.result.options.unshift({
 						label: "Use my current location",
 						value: _this10.state.userLocation

diff --git a/lib/sensors/GeoDistanceSlider.js b/lib/sensors/GeoDistanceSlider.js
@@ -132,7 +132,7 @@ var GeoDistanceSlider = function (_Component) {
 			_this3.locString = location.coords.latitude + ", " + location.coords.longitude;
 
 			axios.get("https://maps.googleapis.com/maps/api/geocode/json?latlng=" + _this3.locString).then(function (res) {
-				if (res.data.results) {
+				if (Array.isArray(res.data.results) && res.data.results.length) {
 					var userLocation = res.data.results[0].formatted_address;
 					_this3.setState({
 						userLocation: userLocation
@@ -216,7 +216,7 @@ var GeoDistanceSlider = function (_Component) {
 
 		if (value && value !== "") {
 			axios.get("https://maps.googleapis.com/maps/api/geocode/json?address=" + value).then(function (res) {
-				if (res.data.results) {
+				if (Array.isArray(res.data.results) && res.data.results.length) {
 					var location = res.data.results[0].geometry.location;
 					_this6.locString = location.lat + ", " + location.lng;
 					if (cb) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@appbaseio/reactivemaps",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Data Components for building map UIs",
   "main": "lib/app.js",
   "scripts": {
@@ -25,7 +25,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@appbaseio/reactivebase": "1.4.0",
+    "@appbaseio/reactivebase": "1.4.1",
     "axios": "^0.15.2",
     "classnames": "^2.2.5",
     "google-map-react": "^0.14.5",

diff --git a/playground/iframe.html b/playground/iframe.html
@@ -18,7 +18,7 @@
       <body>
         <div id="root"></div>
         <div id="error-display"></div>
-        <script src="static/preview.6231695e378e4430d5db.bundle.js"></script>
+        <script src="static/preview.28cb69e10bfc0c67ae3b.bundle.js"></script>
       </body>
     </html>
 
diff --git a/...ic/preview.6231695e378e4430d5db.bundle.js → ...ic/preview.28cb69e10bfc0c67ae3b.bundle.js b/...ic/preview.6231695e378e4430d5db.bundle.js → ...ic/preview.28cb69e10bfc0c67ae3b.bundle.js
diff --git a/umd/reactivemaps.js b/umd/reactivemaps.js
diff --git a/umd/reactivemaps.js.br b/umd/reactivemaps.js.br
diff --git a/umd/reactivemaps.js.gzip b/umd/reactivemaps.js.gzip
diff --git a/yarn.lock b/yarn.lock
@@ -9,15 +9,15 @@
     grunt "~0.4.0"
     serve-static "^1.10.2"
 
-"@appbaseio/[email protected].0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.4.0.tgz#042aa193df6e3ff8287160cf0831722c62764960"
+"@appbaseio/[email protected].1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.4.1.tgz#46d6b2213a0f9a384356eb8d893f48c1ed4239e6"
   dependencies:
     appbase-js "^2.1.0"
     classnames "^2.2.5"
     fbemitter "^2.1.1"
     lodash "^4.17.4"
-    moment "^2.18.1"
+    moment "2.18.1"
     prop-types "^15.6.0"
     rc-slider "^8.3.1"
     react-addons-shallow-compare "^15.4.2"