gmaps4rails 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5258e3e4ac28ce4aee9b51391b51941f70107ab
-  data.tar.gz: f3226ab987085968259cd22c0667c4121e254ae7
+  metadata.gz: 66e8ba074b32b4fdd7e122e2c512c50a826068b6
+  data.tar.gz: 9eca5c6b222f11266666d1e2e149558e90bf2cdb
 SHA512:
-  metadata.gz: 4e5d0937d72dfab9bb75e534d8facc9df45e731df75b29129a65baff56af69f98c9ac04c5fb3a079ca40c3b6a0281db8cb335bc92bd6587deec1d3b502c44b57
-  data.tar.gz: 3d61f999c92e529e8ae4fe3ec53da86fd0ffc67854e256f178e13e0c42df29aa2ea458b78dca2135383ae6333fccbee78356c6e79b985ec126665e88ac72b80b
+  metadata.gz: 845a7f4fb3874697bd3f4cd58e610c5955df650cdb4ece016a07cf79bb213ddd728b10f6f47fb32edcd10ed7e62542204bd1d87a9bc23ff8db848688ed49a36e
+  data.tar.gz: 4349d5157a5b9360474ee3a79772d85bd3b4fedf12ee3ade55cdf2d4575fba16d625ba5ae4986934c1384c3c3f7980b4b2f9a2233f29425532799911c3e72181

data/Gemfile.lock

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

data/js_compilation/gmaps_google.js

@@ -496,12 +496,12 @@
       this.infowindow_binding = __bind(this.infowindow_binding, this);
       this.before_init();
       this.create_marker();
-      this.create_infowindow();
+      this.create_infowindow_on_click();
       this.after_init();
     }
 
     Marker.prototype.build = function() {
-      return new (this.model_class())(this.serviceObject, this.infowindow);
+      return this.marker = new (this.model_class())(this.serviceObject);
     };
 
     Marker.prototype.create_marker = function() {
@@ -512,10 +512,9 @@
       if (!_.isString(this.args.infowindow)) {
         return null;
       }
-      this.infowindow = new (this.primitives().infowindow)({
+      return new (this.primitives().infowindow)({
         content: this.args.infowindow
       });
-      return this.bind_infowindow();
     };
 
     Marker.prototype.marker_options = function() {
@@ -530,23 +529,29 @@
       return _.extend(this.provider_options, base_options);
     };
 
-    Marker.prototype.bind_infowindow = function() {
+    Marker.prototype.create_infowindow_on_click = function() {
       return this.addListener('click', this.infowindow_binding);
     };
 
     Marker.prototype.infowindow_binding = function() {
-      this.panTo();
+      var _base;
       if (this._should_close_infowindow()) {
         this.constructor.CURRENT_INFOWINDOW.close();
       }
+      this.marker.panTo();
+      if (this.infowindow == null) {
+        this.infowindow = this.create_infowindow();
+      }
+      if (this.infowindow == null) {
+        return;
+      }
       this.infowindow.open(this.getServiceObject().getMap(), this.getServiceObject());
+      if ((_base = this.marker).infowindow == null) {
+        _base.infowindow = this.infowindow;
+      }
       return this.constructor.CURRENT_INFOWINDOW = this.infowindow;
     };
 
-    Marker.prototype.panTo = function() {
-      return this.getServiceObject().getMap().panTo(this.getServiceObject().getPosition());
-    };
-
     Marker.prototype._get_picture = function(picture_name) {
       if (!_.isObject(this.args[picture_name]) || !_.isString(this.args[picture_name].url)) {
         return null;
@@ -841,9 +846,8 @@
 
     Marker.include(Gmaps.Google.Objects.Common);
 
-    function Marker(serviceObject, infowindow) {
+    function Marker(serviceObject) {
       this.serviceObject = serviceObject;
-      this.infowindow = infowindow;
     }
 
     Marker.prototype.updateBounds = function(bounds) {
@@ -872,7 +876,16 @@
       this.serviceObject = serviceObject;
     }
 
-    Polygon.prototype.updateBounds = function(bounds) {};
+    Polygon.prototype.updateBounds = function(bounds) {
+      var ll, _i, _len, _ref, _results;
+      _ref = this.serviceObject.getPath().getArray();
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        ll = _ref[_i];
+        _results.push(bounds.extend(ll));
+      }
+      return _results;
+    };
 
     return Polygon;
 
@@ -892,7 +905,16 @@
       this.serviceObject = serviceObject;
     }
 
-    Polyline.prototype.updateBounds = function(bounds) {};
+    Polyline.prototype.updateBounds = function(bounds) {
+      var ll, _i, _len, _ref, _results;
+      _ref = this.serviceObject.getPath().getArray();
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        ll = _ref[_i];
+        _results.push(bounds.extend(ll));
+      }
+      return _results;
+    };
 
     return Polyline;
 

data/lib/gmaps4rails/version.rb

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

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

@@ -30,7 +30,7 @@ class @Gmaps.Google.Builders.Marker extends Gmaps.Objects.BaseBuilder
     @after_init()
 
   build: ->
-    @object = new(@model_class())(@serviceObject)
+    @marker = new(@model_class())(@serviceObject)
 
   create_marker: ->
     @serviceObject = new(@primitives().marker)(@marker_options())
@@ -53,18 +53,15 @@ class @Gmaps.Google.Builders.Marker extends Gmaps.Objects.BaseBuilder
 
   infowindow_binding: =>
     @constructor.CURRENT_INFOWINDOW.close() if @_should_close_infowindow()
-    @panTo()
+    @marker.panTo()
     @infowindow ?= @create_infowindow()
 
     return unless @infowindow?
 
     @infowindow.open( @getServiceObject().getMap(), @getServiceObject())
-    @object.infowindow ?= @infowindow
+    @marker.infowindow ?= @infowindow
     @constructor.CURRENT_INFOWINDOW = @infowindow
 
-  panTo: ->
-    @getServiceObject().getMap().panTo @getServiceObject().getPosition()
-
   _get_picture: (picture_name)->
     return null if !_.isObject(@args[picture_name]) || !_.isString(@args[picture_name].url)
     @_create_or_retrieve_image @_picture_args(picture_name)

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

@@ -5,4 +5,4 @@ class @Gmaps.Google.Objects.Polygon extends Gmaps.Base
   constructor: (@serviceObject)->
 
   updateBounds: (bounds)->
-    #even not provided by google...
+    bounds.extend ll for ll in @serviceObject.getPath().getArray()

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

@@ -5,4 +5,4 @@ class @Gmaps.Google.Objects.Polyline extends Gmaps.Base
   constructor: (@serviceObject)->
 
   updateBounds: (bounds)->
-    #even not provided by google...
+    bounds.extend ll for ll in @serviceObject.getPath().getArray()

metadata

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