Skip to content
Snippets Groups Projects
Commit c494bb6a authored by kirkkala's avatar kirkkala Committed by Andriy Podanenko
Browse files

Issue #2030397 by kirkkala | johnv: Fixed No markers when 'Aggregate...

Issue #2030397 by kirkkala | johnv: Fixed No markers when 'Aggregate JavaScript files.' in IE8 ( due to error 'ID is expected' in highlight.js ? ).
parent cb85a473
No related branches found
No related tags found
No related merge requests found
...@@ -92,15 +92,15 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -92,15 +92,15 @@ Drupal.gmap.addHandler('gmap', function (elem) {
if ( !highlight.behavior ) { highlight.behavior = {}; } // sanity if ( !highlight.behavior ) { highlight.behavior = {}; } // sanity
if ( !highlight.position ) { highlight.position = new google.maps.LatLng( highlight.latitude, highlight.longitude ); } // if you have a pos already then use it, otherwise gimme a lat/lon if ( !highlight.position ) { highlight.position = new google.maps.LatLng( highlight.latitude, highlight.longitude ); } // if you have a pos already then use it, otherwise gimme a lat/lon
jQuery.each({ // collect the options from either the highlight.opts object, from the passed target value, as a behavior or a default value. jQuery.each({ // collect the options from either the highlight.opts object, from the passed target value, as a behavior or a defaultVal value.
radius: {target:'radius',default:10}, // radius in pixels radius: {target:'radius',defaultVal:10}, // radius in pixels
strokeColor: {target:'border',default:'#777777'}, strokeColor: {target:'border',defaultVal:'#777777'},
strokeWeight: {target:'weight',default:2}, strokeWeight: {target:'weight',defaultVal:2},
strokeOpacity: {target:'opacity',default:0.7}, strokeOpacity: {target:'opacity',defaultVal:0.7},
fillColor: {target:'color',default:'#777777'}, fillColor: {target:'color',defaultVal:'#777777'},
fillOpacity: {target:'opacity',default:0.7}, fillOpacity: {target:'opacity',defaultVal:0.7},
draggable: {behavior:'draggable',default:false}, draggable: {behavior:'draggable',defaultVal:false},
editable: {behavior:'editable',default:false}, editable: {behavior:'editable',defaultVal:false}
}, function( key , config ) { }, function( key , config ) {
if ( highlight.opts[key] ) { // options was passed in if ( highlight.opts[key] ) { // options was passed in
return true; return true;
...@@ -111,8 +111,8 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -111,8 +111,8 @@ Drupal.gmap.addHandler('gmap', function (elem) {
else if ( config.behavior && highlight.behavior && highlight.behavior[ config.behavior ] ) { // value is a behaviour, should it be enabled? else if ( config.behavior && highlight.behavior && highlight.behavior[ config.behavior ] ) { // value is a behaviour, should it be enabled?
highlight.opts[key] = highlight.behavior[ config.behavior ]; highlight.opts[key] = highlight.behavior[ config.behavior ];
} }
else if (config.default) { // default value else if (config.defaultVal) { // defaultVal value
highlight.opts[key] = config.default; highlight.opts[key] = config.defaultVal;
} }
}); });
...@@ -182,7 +182,7 @@ Drupal.gmap.addHandler('gmap', function (elem) { ...@@ -182,7 +182,7 @@ Drupal.gmap.addHandler('gmap', function (elem) {
}); });
// Marker specific highlight events: // Marker specific highlight events:
var highlightedMarkers = []; // remember markers that have been highlighted. so that we can un-highlight them all at one. The default behaviour is to allow only 1 marker highlighted at any time. var highlightedMarkers = []; // remember markers that have been highlighted. so that we can un-highlight them all at one. The defaultVal behaviour is to allow only 1 marker highlighted at any time.
obj.bind('markerHighlight', function (marker) { obj.bind('markerHighlight', function (marker) {
highlightedMarkers.push( marker ); highlightedMarkers.push( marker );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment