Permalink
Browse files

Merge branch 'master' of git://github.com/apneadiving/Google-Maps-for…

…-Rails
  • Loading branch information...
2 parents 5f0f951 + 7f9cfd2 commit 6d8780f21cb8cc180d12c6391f74df21baf7aac4 @kristianmandrup committed Oct 12, 2012
View
2 app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee
@@ -89,7 +89,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
style_mark.backgroundXOffset = args.shadow_anchor[0]
style_mark.backgroundYOffset = args.shadow_anchor[1]
- style_mark.graphicTitle = args.title
+ style_mark.graphicTitle = args.marker_title
marker = new OpenLayers.Feature.Vector(
new OpenLayers.Geometry.Point(args.Lng, args.Lat),
null,
View
10 lib/gmaps4rails/view_helper.rb
@@ -66,9 +66,9 @@ def get_vendor_scripts
when "mapquest" then @js_array << "#{MAPQUEST}?key=#{provider_key}"
when "bing" then @js_array << BING
else #case googlemaps which is the default
- @js_array << "#{GOOGLE}&sensor=false&key=#{provider_key}&libraries=geometry#{google_libraries}&#{google_map_i18n}"
+ @js_array << "#{GOOGLE}&sensor=false&client=#{client}&key=#{provider_key}&libraries=geometry#{google_libraries}&#{google_map_i18n}"
@js_array << "#{GOOGLE_EXT}tags/infobox/1.1.9/src/infobox_packed.js" if custom_infowindow_class
- @js_array << "#{GOOGLE_EXT}tags/markerclustererplus/2.0.9/src/markerclusterer_packed.js" if do_clustering
+ @js_array << "#{GOOGLE_EXT}tags/markerclustererplus/2.0.14/src/markerclusterer_packed.js" if do_clustering
@js_array << "#{GOOGLE_EXT}trunk/richmarker/src/richmarker-compiled.js" if rich_marker
end
end
@@ -111,6 +111,10 @@ def scripts
def provider_key
map_options.try(:[], :provider_key)
end
+
+ def client
+ map_options.try(:[], :client)
+ end
# when custom_infowindow_class is added in the marker_options,
#it means user wants to use the InfoBox googlemap's plugin
@@ -168,4 +172,4 @@ def container_class
end
-end
+end

0 comments on commit 6d8780f

Please sign in to comment.