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 {
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 ;
Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 ;
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments