- (Bug Fix) Fixed an issue causing a JS error when attempting to set an icon on a marker before the api property has been set

objectivehtml · objectivehtml · commit 8d76ce3c158b · 2014-12-02T13:28:32.000-05:00
diff --git a/resources/js/plugin.js b/resources/js/plugin.js
@@ -416,6 +416,8 @@ var GoogleMaps = {
 				this.map.addMarker(this, this.fitBounds);
 
 				this.createInfoWindow();
+
+				this.setIcon(this.icon);
 			}
 			else if(this.address) {
 				this.geocoder.geocode({address: this.address}, function(results, status) {
@@ -432,11 +434,11 @@ var GoogleMaps = {
 						t.map.addMarker(t, t.fitBounds);
 
 						t.createInfoWindow();
+
+						t.setIcon(t.icon);
 					}
 				});
 			}
-
-			this.setIcon(this.icon);
 		},
 
 		shouldCluster: function() {

Original file line number	Diff line number	Diff line change
`@@ -416,6 +416,8 @@ var GoogleMaps = {`
`416`	`416`	`this.map.addMarker(this, this.fitBounds);`
`417`	`417`
`418`	`418`	`this.createInfoWindow();`
	`419`	`+`
	`420`	`+ this.setIcon(this.icon);`
`419`	`421`	`}`
`420`	`422`	`else if(this.address) {`
`421`	`423`	`this.geocoder.geocode({address: this.address}, function(results, status) {`
`@@ -432,11 +434,11 @@ var GoogleMaps = {`
`432`	`434`	`t.map.addMarker(t, t.fitBounds);`
`433`	`435`
`434`	`436`	`t.createInfoWindow();`
	`437`	`+`
	`438`	`+ t.setIcon(t.icon);`
`435`	`439`	`}`
`436`	`440`	`});`
`437`	`441`	`}`
`438`		`-`
`439`		`- this.setIcon(this.icon);`
`440`	`442`	`},`
`441`	`443`
`442`	`444`	`shouldCluster: function() {`