File tree Expand file tree Collapse file tree 4 files changed +14
-0
lines changed Expand file tree Collapse file tree 4 files changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -248,6 +248,9 @@ var map_controller_default = class extends abstract_map_controller_default {
248
248
this . createInfoWindow ( { definition : infoWindow , element : marker } ) ;
249
249
}
250
250
if ( icon ) {
251
+ if ( rawOptions . hasOwnProperty ( "content" ) || bridgeOptions . hasOwnProperty ( "content" ) ) {
252
+ console . warn ( 'The "content" parameter is also defined in the "rawOptions" or "bridgeOptions" of the marker and will be ignored.' ) ;
253
+ }
251
254
this . doCreateIcon ( { definition : icon , element : marker } ) ;
252
255
}
253
256
return marker ;
Original file line number Diff line number Diff line change @@ -188,6 +188,10 @@ export default class extends AbstractMapController<
188
188
}
189
189
190
190
if ( icon ) {
191
+ if ( rawOptions . hasOwnProperty ( 'content' ) || bridgeOptions . hasOwnProperty ( 'content' ) ) {
192
+ console . warn ( 'The "content" parameter is also defined in the "rawOptions" or "bridgeOptions" of the marker and will be ignored.' ) ;
193
+ }
194
+
191
195
this . doCreateIcon ( { definition : icon , element : marker } ) ;
192
196
}
193
197
Original file line number Diff line number Diff line change @@ -228,6 +228,9 @@ var map_controller_default = class extends abstract_map_controller_default {
228
228
this . createInfoWindow ( { definition : infoWindow , element : marker2 } ) ;
229
229
}
230
230
if ( icon2 ) {
231
+ if ( rawOptions . hasOwnProperty ( "icon" ) || bridgeOptions . hasOwnProperty ( "icon" ) ) {
232
+ console . warn ( 'The "icon" parameter is also defined in the "rawOptions" or "bridgeOptions" of the marker and will be ignored.' ) ;
233
+ }
231
234
this . doCreateIcon ( { definition : icon2 , element : marker2 } ) ;
232
235
}
233
236
return marker2 ;
Original file line number Diff line number Diff line change @@ -154,6 +154,10 @@ export default class extends AbstractMapController<
154
154
}
155
155
156
156
if ( icon ) {
157
+ if ( rawOptions . hasOwnProperty ( 'icon' ) || bridgeOptions . hasOwnProperty ( 'icon' ) ) {
158
+ console . warn ( 'The "icon" parameter is also defined in the "rawOptions" or "bridgeOptions" of the marker and will be ignored.' ) ;
159
+ }
160
+
157
161
this . doCreateIcon ( { definition : icon , element : marker } ) ;
158
162
}
159
163
You can’t perform that action at this time.
0 commit comments