geocomplete_rails 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c98206237b7f337a6ae95ed9634d8f63b3f8ce7
-  data.tar.gz: c6896d1fda94b8b229ffbca47c20631bf44ac697
+  metadata.gz: 3001815772a7bda654b34a52508fee477b1d26f4
+  data.tar.gz: 5bc8b2ee07cfeef68500314517627047cd0877b9
 SHA512:
-  metadata.gz: d5261f258b4613d5b737a0a5b9841c25a13b9d70e5320e40f11aec2fd28ef75c77af89d06b73afb2327a806048c2d7c33a8abcd2f93496f51b49eb9091f53f5c
-  data.tar.gz: c3e32fdbd8828e8a5912186befd3102fa414b4db74e1bef86ba81487896df3e3d8640258f5148267ab56509f81ef2014f0f943553a7274b21de5a30de1ff420e
+  metadata.gz: c65350dbc608ffb8215c85392ea98c8a45c952dc8cd1dd4f98057ae2f690c347c45f4cd837b5f6e0ab9c2d220f0a3f99ffd4aa67e1d53404fb72947e99d82d98
+  data.tar.gz: e3302072241edfb27a01c4aaa5cc5799fe0dbe6231a8009359b7ee0ec32f81890e781feca226c836ddb75e87b7bcd93a85e8a644e4fd5916cc2303a21594e17a

data/app/assets/javascripts/geocomplete.js

@@ -1,5 +1,5 @@
 /**
- * jQuery Geocoding and Places Autocomplete Plugin - V 1.6.4
+ * jQuery Geocoding and Places Autocomplete Plugin - V 1.6.5
  *
  * @author Martin Kleppe <kleppe@ubilabs.net>, 2014
  * @author Ubilabs http://ubilabs.net, 2014
@@ -19,6 +19,7 @@
   //
   // * `map` - Might be a selector, an jQuery object or a DOM element. Default is `false` which shows no map.
   // * `details` - The container that should be populated with data. Defaults to `false` which ignores the setting.
+  // * 'detailsScope' - Allows you to scope the 'details' container and have multiple geocomplete fields on one page. Must be a parent of the input. Default is 'null'
   // * `location` - Location to initialize the map on. Might be an address `string` or an `array` with [latitude, longitude] or a `google.maps.LatLng`object. Default is `false` which shows a blank map.
   // * `bounds` - Whether to snap geocode search to map bounds. Default: `true` if false search globally. Alternatively pass a custom `LatLngBounds object.
   // * `autoselect` - Automatically selects the highlighted item or the first item from the suggestions list on Enter.
@@ -34,6 +35,7 @@
   // * `types` - An array containing one or more of the supported types for the places request. Default: `['geocode']` See the full list [here](http://code.google.com/apis/maps/documentation/javascript/places.html#place_search_requests).
   // * `blur` - Trigger geocode when input loses focus.
   // * `geocodeAfterResult` - If blur is set to true, choose whether to geocode if user has explicitly selected a result before blur.
+  // * `restoreValueAfterBlur` - Restores the input's value upon blurring. Default is `false` which ignores the setting.
 
   var defaults = {
     bounds: true,
@@ -41,6 +43,7 @@
     map: false,
     details: false,
     detailsAttribute: "name",
+    detailsScope: null,
     autoselect: true,
     location: false,
 
@@ -57,7 +60,8 @@
     maxZoom: 16,
     types: ['geocode'],
     blur: false,
-    geocodeAfterResult: false
+    geocodeAfterResult: false,
+    restoreValueAfterBlur: false
   };
 
   // See: [Geocoding Types](https://developers.google.com/maps/documentation/geocoding/#Types)
@@ -122,6 +126,20 @@
         $.proxy(this.mapClicked, this)
       );
 
+      // add dragend even listener on the map
+      google.maps.event.addListener(
+        this.map,
+        'dragend',
+        $.proxy(this.mapDragged, this)
+      );
+
+      // add idle even listener on the map
+      google.maps.event.addListener(
+        this.map,
+        'idle',
+        $.proxy(this.mapIdle, this)
+      );
+
       google.maps.event.addListener(
         this.map,
         'zoom_changed',
@@ -184,14 +202,14 @@
       );
 
       // Prevent parent form from being submitted if user hit enter.
-      this.$input.keypress(function(event){
+      this.$input.on('keypress.' + this._name, function(event){
         if (event.keyCode === 13){ return false; }
       });
 
       // Assume that if user types anything after having selected a result,
       // the selected location is not valid any more.
       if (this.options.geocodeAfterResult === true){
-        this.$input.bind('keypress', $.proxy(function(){
+        this.$input.bind('keypress.' + this._name, $.proxy(function(){
           if (event.keyCode != 9 && this.selected === true){
               this.selected = false;
           }
@@ -199,18 +217,28 @@
       }
 
       // Listen for "geocode" events and trigger find action.
-      this.$input.bind("geocode", $.proxy(function(){
+      this.$input.bind('geocode.' + this._name, $.proxy(function(){
         this.find();
       }, this));
 
+      // Saves the previous input value
+      this.$input.bind('geocode:result.' + this._name, $.proxy(function(){
+        this.lastInputVal = this.$input.val();
+      }, this));
+
       // Trigger find action when input element is blurred out and user has
       // not explicitly selected a result.
       // (Useful for typing partial location and tabbing to the next field
       // or clicking somewhere else.)
       if (this.options.blur === true){
-        this.$input.blur($.proxy(function(){
-          if (this.options.geocodeAfterResult === true && this.selected === true){ return; }
-          this.find();
+        this.$input.on('blur.' + this._name, $.proxy(function(){
+          if (this.options.geocodeAfterResult === true && this.selected === true) { return; }
+
+          if (this.options.restoreValueAfterBlur === true && this.selected === true) {
+            setTimeout($.proxy(this.restoreLastValue, this), 0);
+          } else {
+            this.find();
+          }
         }, this));
       }
     },
@@ -221,8 +249,13 @@
     initDetails: function(){
       if (!this.options.details){ return; }
 
-      var $details = $(this.options.details),
-        attribute = this.options.detailsAttribute,
+      if(this.options.detailsScope) {
+        var $details = $(this.input).parents(this.options.detailsScope).find(this.options.details);
+      } else {
+        var $details = $(this.options.details);
+      }
+
+      var attribute = this.options.detailsAttribute,
         details = {};
 
       function setDetail(value){
@@ -269,6 +302,20 @@
       }
     },
 
+    destroy: function(){
+      if (this.map) {
+        google.maps.event.clearInstanceListeners(this.map);
+        google.maps.event.clearInstanceListeners(this.marker);
+      }
+
+      this.autocomplete.unbindAll();
+      google.maps.event.clearInstanceListeners(this.autocomplete);
+      google.maps.event.clearInstanceListeners(this.input);
+      this.$input.removeData();
+      this.$input.off(this._name);
+      this.$input.unbind('.' + this._name);
+    },
+
     // Look up a given address. If no `address` was specified it uses
     // the current value of the input.
     find: function(address){
@@ -280,6 +327,10 @@
     // Requests details about a given location.
     // Additionally it will bias the requests to the provided bounds.
     geocode: function(request){
+      // Don't geocode if the requested address is empty
+      if (!request.address) {
+        return;
+      }
       if (this.options.bounds && !request.bounds){
         if (this.options.bounds === true){
           request.bounds = this.map && this.map.getBounds();
@@ -321,6 +372,11 @@
       return firstResult;
     },
 
+    // Restores the input value using the previous value if it exists
+    restoreLastValue: function() {
+      if (this.lastInputVal){ this.$input.val(this.lastInputVal); }
+    },
+
     // Handles the geocode response. If more than one results was found
     // it triggers the "geocode:multiple" events. If there was an error
     // the "geocode:error" event is fired.
@@ -451,11 +507,21 @@
         this.trigger("geocode:click", event.latLng);
     },
 
+    // Fire the "geocode:mapdragged" event and pass the current position of the map center.
+    mapDragged: function(event) {
+      this.trigger("geocode:mapdragged", this.map.getCenter());
+    },
+
+    // Fire the "geocode:idle" event and pass the current position of the map center.
+    mapIdle: function(event) {
+      this.trigger("geocode:idle", this.map.getCenter());
+    },
+
     mapZoomed: function(event) {
       this.trigger("geocode:zoom", this.map.getZoom());
     },
 
-    // Restore the old position of the marker to the last now location.
+    // Restore the old position of the marker to the last knwon location.
     resetMarker: function(){
       this.marker.setPosition(this.data.location);
       this.setDetail(this.details.lat, this.data.location.lat());

data/lib/geocomplete_rails/version.rb

@@ -1,3 +1,3 @@
 module GeocompleteRails
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geocomplete_rails
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Guy Israeli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: jQuery Geocoding and Places Autocomplete Plugin