Skip to content

Commit ecaa959

Browse files
committed
[Map] Fix customize icon with bridgeOptions
1 parent b40c59c commit ecaa959

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/Map/src/Bridge/Google/assets/dist/map_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ var map_controller_default = class extends abstract_map_controller_default {
247247
if (infoWindow) {
248248
this.createInfoWindow({ definition: infoWindow, element: marker });
249249
}
250-
if (icon) {
250+
if (icon && !rawOptions.hasOwnProperty("content") && !bridgeOptions.hasOwnProperty("content")) {
251251
this.doCreateIcon({ definition: icon, element: marker });
252252
}
253253
return marker;

src/Map/src/Bridge/Google/assets/src/map_controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export default class extends AbstractMapController<
187187
this.createInfoWindow({ definition: infoWindow, element: marker });
188188
}
189189

190-
if (icon) {
190+
if (icon && !rawOptions.hasOwnProperty('content') && !bridgeOptions.hasOwnProperty('content')) {
191191
this.doCreateIcon({ definition: icon, element: marker });
192192
}
193193

src/Map/src/Bridge/Leaflet/assets/dist/map_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ var map_controller_default = class extends abstract_map_controller_default {
227227
if (infoWindow) {
228228
this.createInfoWindow({ definition: infoWindow, element: marker2 });
229229
}
230-
if (icon2) {
230+
if (icon2 && !rawOptions.hasOwnProperty("icon") && !bridgeOptions.hasOwnProperty("icon")) {
231231
this.doCreateIcon({ definition: icon2, element: marker2 });
232232
}
233233
return marker2;

src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export default class extends AbstractMapController<
153153
this.createInfoWindow({ definition: infoWindow, element: marker });
154154
}
155155

156-
if (icon) {
156+
if (icon && !rawOptions.hasOwnProperty('icon') && !bridgeOptions.hasOwnProperty('icon')) {
157157
this.doCreateIcon({ definition: icon, element: marker });
158158
}
159159

0 commit comments

Comments
 (0)