gmaps4rails 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d37c1adc6f0749181e2f7c73d237429ce20a842
-  data.tar.gz: 8080428600979d11005c1917484aaf84a04c5d87
+  metadata.gz: c5258e3e4ac28ce4aee9b51391b51941f70107ab
+  data.tar.gz: f3226ab987085968259cd22c0667c4121e254ae7
 SHA512:
-  metadata.gz: 83db60b9cb073df5902350e620b44c07ed66131d37893d7789ffb326aa0ac8aaad2fa63b68b418e7dc40fe50c6d64121a99c8bf41b8a43378b1b9d020d73b3da
-  data.tar.gz: 88824d73a049af2fa8e8d458e6767326a7b57f4710017e662aeb7cf2be8a59339f6e50cf51ed562a082c59b3a3412730949f9f672611fc6ad66fdac2455c1792
+  metadata.gz: 4e5d0937d72dfab9bb75e534d8facc9df45e731df75b29129a65baff56af69f98c9ac04c5fb3a079ca40c3b6a0281db8cb335bc92bd6587deec1d3b502c44b57
+  data.tar.gz: 3d61f999c92e529e8ae4fe3ec53da86fd0ffc67854e256f178e13e0c42df29aa2ea458b78dca2135383ae6333fccbee78356c6e79b985ec126665e88ac72b80b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gmaps4rails (2.0.5)
+    gmaps4rails (2.1.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/gmaps4rails/version.rb

@@ -1,3 +1,3 @@
 module Gmaps4rails
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end

data/spec/javascripts/google/builders/marker_spec.js

@@ -42,8 +42,8 @@ describe("Gmaps.Google.Builders.Marker", function() {
           called_lat = primitives.latLng.mostRecentCall.args[0];
           called_lng = primitives.latLng.mostRecentCall.args[1];
 
-          expect(called_lat).toBeWithinOf(args.lat, 0.0001);
-          expect(called_lng).toBeWithinOf(args.lng, 0.0001);
+          expect(called_lat).toBeWithinOf(args.lat, 0.00011);
+          expect(called_lng).toBeWithinOf(args.lng, 0.00011);
         });
       });
 

data/vendor/assets/javascripts/gmaps/google/builders/marker.coffee

@@ -26,19 +26,18 @@ class @Gmaps.Google.Builders.Marker extends Gmaps.Objects.BaseBuilder
   constructor: (@args, @provider_options = {}, @internal_options = {})->
     @before_init()
     @create_marker()
-    @create_infowindow()
+    @create_infowindow_on_click()
     @after_init()
 
   build: ->
-    new(@model_class())(@serviceObject, @infowindow)
+    @object = new(@model_class())(@serviceObject)
 
   create_marker: ->
     @serviceObject = new(@primitives().marker)(@marker_options())
 
   create_infowindow: ->
     return null unless _.isString @args.infowindow
-    @infowindow = new(@primitives().infowindow)({content: @args.infowindow })
-    @bind_infowindow()
+    new(@primitives().infowindow)({content: @args.infowindow })
 
   marker_options: ->
     coords = @_randomized_coordinates()
@@ -49,13 +48,18 @@ class @Gmaps.Google.Builders.Marker extends Gmaps.Objects.BaseBuilder
       shadow:   @_get_picture('shadow')
     _.extend @provider_options, base_options
 
-  bind_infowindow: ->
+  create_infowindow_on_click: ->
     @addListener 'click', @infowindow_binding
 
   infowindow_binding: =>
-    @panTo()
     @constructor.CURRENT_INFOWINDOW.close() if @_should_close_infowindow()
+    @panTo()
+    @infowindow ?= @create_infowindow()
+
+    return unless @infowindow?
+
     @infowindow.open( @getServiceObject().getMap(), @getServiceObject())
+    @object.infowindow ?= @infowindow
     @constructor.CURRENT_INFOWINDOW = @infowindow
 
   panTo: ->

data/vendor/assets/javascripts/gmaps/google/objects/marker.coffee

@@ -2,7 +2,8 @@ class @Gmaps.Google.Objects.Marker extends Gmaps.Base
 
   @include Gmaps.Google.Objects.Common
 
-  constructor: (@serviceObject, @infowindow)->
+  # @infowindow is set later, once marker is clicked
+  constructor: (@serviceObject)->
 
   updateBounds: (bounds)->
     bounds.extend(@getServiceObject().position)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gmaps4rails
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Benjamin Roth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec