gmaps4rails 1.2.1 → 1.3.0

data/README.rdoc

@@ -27,7 +27,7 @@ Any help would be appreciated to complete this work.
 
 == Requirements
 - gem 'gmaps4rails'     (in your gemfile, then bundle)
-- <%= yield :head %>    (in your header) 
+- <%= yield :head %>    (in your header, Rails 3.0.x only) 
 - <%= yield :scripts %> (in your footer)
 
 To make Rails serve the assets (javascripts, stylesheets and marker images) you have several options, depending on your configuration and Rails version:
@@ -43,7 +43,9 @@ To make Rails serve the assets (javascripts, stylesheets and marker images) you
   
   * //= require gmaps4rails/all_apis.js
   
-  You even don't need the `yield :head` if you include `require gmaps4rails` in your CSS manifest.
+  Stylesheet:
+  
+  * `require gmaps4rails` (if you use the default)
   
 - if you are using Rails 3.0:
   see para below to be sure everything will work in production.
@@ -109,7 +111,7 @@ Done!
 
 == Todo?
 
-Feel free ton contact us, you have your say.
+Feel free to contact us, you have your say.
 
 == Copyright
 MIT license. 

data/app/assets/javascripts/gmaps4rails/gmaps4rails.base.js.coffee

@@ -24,6 +24,7 @@ class @Gmaps4Rails
     @callback           = -> false  #to let user set a custom callback function
     @customClusterer    = -> false  #to let user set custom clusterer pictures
     @infobox            = -> false  #to let user use custom infoboxes
+    @jsTemplate         = false     #to let user create infowindows client side
 
     @default_map_options = 
       id: 'map'

data/app/assets/javascripts/gmaps4rails/gmaps4rails.googlemaps.js.coffee

@@ -211,22 +211,23 @@ class @Gmaps4RailsGoogle extends Gmaps4Rails
   #////////////////////////////////////////////////////
 
   #// creates infowindows
-  createInfoWindow : (marker_container) ->
-    if @markers_conf.custom_infowindow_class == null && marker_container.description?
-      #create the infowindow
-      marker_container.infowindow = new google.maps.InfoWindow({content: marker_container.description })
-      #add the listener associated
-      currentMap = this
-      google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
-    else #creating custom infowindow
-      if marker_container.description?
+  createInfoWindow : (marker_container) ->    
+    if typeof(@jsTemplate) == "function" or marker_container.description?
+      marker_container.description = @jsTemplate(marker_container) if typeof(@jsTemplate) == "function"
+      if @markers_conf.custom_infowindow_class != null
+        #creating custom infowindow
         boxText = document.createElement("div")
         boxText.setAttribute("class", @markers_conf.custom_infowindow_class) #to customize
-        boxText.innerHTML = marker_container.description 
+        boxText.innerHTML = marker_container.description
         marker_container.infowindow = new InfoBox(@infobox(boxText))
         currentMap = this
         google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
-
+      else
+        #create default infowindow
+        marker_container.infowindow = new google.maps.InfoWindow({content: marker_container.description })
+        #add the listener associated
+        currentMap = this
+        google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
 
   openInfoWindow : (currentMap, infoWindow, marker) ->
     return ->

data/app/assets/javascripts/gmaps4rails/gmaps4rails.openlayers.js.coffee

@@ -159,7 +159,7 @@ class @Gmaps4RailsOpenlayers extends Gmaps4Rails
        if @markerClusterer != null
          @clearClusterer()
        markers_array = new Array
-       for marker in markers
+       for marker in @markers
          markers_array.push(marker.serviceObject)
        @markerClusterer = @createClusterer markers_array
    

data/app/views/gmaps4rails/_gmaps4rails.html.erb

@@ -1,7 +1,9 @@
 <% #thanks to enable_css, user can avoid this css to be loaded
 if enable_css == true and options[:scripts].nil? %>
-	<% content_for :head do %>
-	<%= stylesheet_link_tag 'gmaps4rails' %>
+  <% if Rails::VERSION::MAJOR >= 3 and Rails::VERSION::MINOR < 1 %>
+    <% content_for :head do %>
+      <%= stylesheet_link_tag 'gmaps4rails' %>
+    <% end %>
 	<% end %>
 <% end %>
 <% content_for :scripts do %>

data/public/javascripts/gmaps4rails/gmaps4rails.base.js

@@ -29,6 +29,7 @@
       this.infobox = function() {
         return false;
       };
+      this.jsTemplate = false;
       this.default_map_options = {
         id: 'map',
         draggable: true,

data/public/javascripts/gmaps4rails/gmaps4rails.googlemaps.js

@@ -239,20 +239,23 @@
     };
     Gmaps4RailsGoogle.prototype.createInfoWindow = function(marker_container) {
       var boxText, currentMap;
-      if (this.markers_conf.custom_infowindow_class === null && (marker_container.description != null)) {
-        marker_container.infowindow = new google.maps.InfoWindow({
-          content: marker_container.description
-        });
-        currentMap = this;
-        return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject));
-      } else {
-        if (marker_container.description != null) {
+      if (typeof this.jsTemplate === "function" || (marker_container.description != null)) {
+        if (typeof this.jsTemplate === "function") {
+          marker_container.description = this.jsTemplate(marker_container);
+        }
+        if (this.markers_conf.custom_infowindow_class !== null) {
           boxText = document.createElement("div");
           boxText.setAttribute("class", this.markers_conf.custom_infowindow_class);
           boxText.innerHTML = marker_container.description;
           marker_container.infowindow = new InfoBox(this.infobox(boxText));
           currentMap = this;
           return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject));
+        } else {
+          marker_container.infowindow = new google.maps.InfoWindow({
+            content: marker_container.description
+          });
+          currentMap = this;
+          return google.maps.event.addListener(marker_container.serviceObject, 'click', this.openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject));
         }
       }
     };

data/public/javascripts/gmaps4rails/gmaps4rails.openlayers.js

@@ -148,14 +148,15 @@
       return clusters;
     };
     Gmaps4RailsOpenlayers.prototype.clusterize = function() {
-      var marker, markers_array, _i, _len;
+      var marker, markers_array, _i, _len, _ref;
       if (this.markers_conf.do_clustering === true) {
         if (this.markerClusterer !== null) {
           this.clearClusterer();
         }
         markers_array = new Array;
-        for (_i = 0, _len = markers.length; _i < _len; _i++) {
-          marker = markers[_i];
+        _ref = this.markers;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          marker = _ref[_i];
           markers_array.push(marker.serviceObject);
         }
         return this.markerClusterer = this.createClusterer(markers_array);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
-  requirement: &2152393380 !ruby/object:Gem::Requirement
+  requirement: &2152373580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152393380
+  version_requirements: *2152373580
 description: ! 'Enables easy display of items (taken from a Rails 3 model) on a Google
   Maps (JS API V3), OpenLayers, Mapquest and Bing. Geocoding + Directions included.
   Provides much options: markers customization, infowindows, auto-adjusted zoom, polylines,