File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -247,7 +247,7 @@ var map_controller_default = class extends abstract_map_controller_default {
247
247
if ( infoWindow ) {
248
248
this . createInfoWindow ( { definition : infoWindow , element : marker } ) ;
249
249
}
250
- if ( icon ) {
250
+ if ( icon && ! rawOptions . hasOwnProperty ( "content" ) && ! bridgeOptions . hasOwnProperty ( "content" ) ) {
251
251
this . doCreateIcon ( { definition : icon , element : marker } ) ;
252
252
}
253
253
return marker ;
Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ export default class extends AbstractMapController<
187
187
this . createInfoWindow ( { definition : infoWindow , element : marker } ) ;
188
188
}
189
189
190
- if ( icon ) {
190
+ if ( icon && ! rawOptions . hasOwnProperty ( 'content' ) && ! bridgeOptions . hasOwnProperty ( 'content' ) ) {
191
191
this . doCreateIcon ( { definition : icon , element : marker } ) ;
192
192
}
193
193
Original file line number Diff line number Diff line change @@ -227,7 +227,7 @@ var map_controller_default = class extends abstract_map_controller_default {
227
227
if ( infoWindow ) {
228
228
this . createInfoWindow ( { definition : infoWindow , element : marker2 } ) ;
229
229
}
230
- if ( icon2 ) {
230
+ if ( icon2 && ! rawOptions . hasOwnProperty ( "icon" ) && ! bridgeOptions . hasOwnProperty ( "icon" ) ) {
231
231
this . doCreateIcon ( { definition : icon2 , element : marker2 } ) ;
232
232
}
233
233
return marker2 ;
Original file line number Diff line number Diff line change @@ -153,7 +153,7 @@ export default class extends AbstractMapController<
153
153
this . createInfoWindow ( { definition : infoWindow , element : marker } ) ;
154
154
}
155
155
156
- if ( icon ) {
156
+ if ( icon && ! rawOptions . hasOwnProperty ( 'icon' ) && ! bridgeOptions . hasOwnProperty ( 'icon' ) ) {
157
157
this . doCreateIcon ( { definition : icon , element : marker } ) ;
158
158
}
159
159
You can’t perform that action at this time.
0 commit comments