Merge pull request #89 from Logicify/development

Released version v0.1.15
Logicify · Sep 26, 2016 · 648dc1f · 648dc1f
2 parents d717c60 + 3f46656
commit 648dc1f
Show file tree

Hide file tree

Showing 15 changed files with 253 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules
+node_modules
+.idea
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -38,7 +38,8 @@ module.exports = function (grunt) {
                     sourceMap: true
                 },
                 files: {
-                    '<%= appConfig.dist %>/locationpicker.jquery.min.js': ['<%= appConfig.app %>/*.js']
+                    '<%= appConfig.dist %>/locationpicker.jquery.min.js': ['<%= appConfig.app %>/locationpicker.jquery.js'],
+                    '<%= appConfig.dist %>/angularLocationpicker.jquery.min.js': ['<%= appConfig.app %>/angularLocationpicker.jquery.js']
                 }
             },
             beautify: {
@@ -52,7 +53,8 @@ module.exports = function (grunt) {
                     mangle: false
                 },
                 files: {
-                    '<%= appConfig.dist %>/locationpicker.jquery.js': ['<%= appConfig.app %>/*.js']
+                    '<%= appConfig.dist %>/locationpicker.jquery.js': ['<%= appConfig.app %>/locationpicker.jquery.js'],
+                    '<%= appConfig.dist %>/angularLocationpicker.jquery.js': ['<%= appConfig.app %>/angularLocationpicker.jquery.js']
                 }
             }
         }

diff --git a/README.md b/README.md
@@ -40,6 +40,7 @@ Documentation along with examples available [here](http://logicify.github.io/jqu
 
 Credits
 -------
-Dmitry Berezovsky, Logicify (<http://logicify.com/>)  
-Emanuele Coppola, Libre sc (<http://libreidee.com/>)
+* Dmitry Berezovsky, Logicify (<http://logicify.com/>)
+* Gennadiy Varava, Logicify (<http://logicify.com/>)
+* Emanuele Coppola, Libre sc (<http://libreidee.com/>)
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
-  "name": "jquery-locationpicker",
-  "version": "0.1.14",
+  "name": "jquery-locationpicker-plugin",
+  "version": "0.1.15",
   "homepage": "https://github.com/Logicify/jquery-locationpicker-plugin",
   "authors": [
     "Dmitry Berezovsky <[email protected]>"

diff --git a/dist/angularLocationpicker.jquery.js b/dist/angularLocationpicker.jquery.js
@@ -0,0 +1,48 @@
+/*! jquery-locationpicker - v0.1.15 - 2016-09-26 */
+"use strict";
+
+angular.module("angular-jquery-locationpicker", []).constant("angularJQueryLocationpickerDefaultValue", {
+    css: {
+        width: "550px",
+        height: "400px",
+        "float": "left"
+    }
+}).service("angularJQueryLocationpickerService", [ "angularJQueryLocationpickerDefaultValue", function(defaultValue) {
+    var service = {};
+    service.callAutosizeOnInit = function(element, initCb) {
+        var cb = initCb;
+        if (!!cb) {
+            initCb = function() {
+                $(element).locationpicker("autosize");
+                cb();
+            };
+        } else {
+            initCb = function() {
+                $(element).locationpicker("autosize");
+            };
+        }
+    };
+    service.checkDefaultStyles = function(element) {
+        var elementStyle = element[0].style;
+        element.css({
+            width: elementStyle.width || defaultValue.css.width,
+            height: elementStyle.height || defaultValue.css.height,
+            "float": elementStyle.float || defaultValue.css.float,
+            overflow: "hidden"
+        });
+    };
+    return service;
+} ]).directive("locationpicker", [ "angularJQueryLocationpickerService", function(service) {
+    return {
+        restrict: "EA",
+        replace: true,
+        scope: {
+            options: "="
+        },
+        link: function(scope, element, attrs) {
+            service.checkDefaultStyles(element);
+            service.callAutosizeOnInit(element, scope.options.oninitialized);
+            $(element).locationpicker(scope.options);
+        }
+    };
+} ]);
diff --git a/dist/angularLocationpicker.jquery.min.js b/dist/angularLocationpicker.jquery.min.js
diff --git a/dist/angularLocationpicker.jquery.min.js.map b/dist/angularLocationpicker.jquery.min.js.map
diff --git a/dist/locationpicker.jquery.js b/dist/locationpicker.jquery.js
@@ -1,4 +1,4 @@
-/*! jquery-locationpicker - v0.1.14 - 2016-09-20 */
+/*! jquery-locationpicker - v0.1.15 - 2016-09-26 */
 (function($) {
     function GMapContext(domElement, options) {
         var _map = new google.maps.Map(domElement, options);
@@ -91,6 +91,10 @@
                     var address = GmUtility.addressByFormat(results, gmapContext.settings.addressFormat);
                     gmapContext.locationName = address.formatted_address;
                     gmapContext.addressComponents = GmUtility.address_component_from_google_geocode(address.address_components);
+                } else if (status == google.maps.GeocoderStatus.OVER_QUERY_LIMIT) {
+                    return setTimeout(function() {
+                        GmUtility.updateLocationName(gmapContext, callback);
+                    }, 1e3);
                 }
                 if (callback) {
                     callback.call(this, gmapContext);
@@ -148,10 +152,11 @@
         if (inputBinding) {
             if (inputBinding.radiusInput) {
                 inputBinding.radiusInput.on("change", function(e) {
-                    if (!e.originalEvent) {
+                    var radiusInputValue = $(this).val();
+                    if (!e.originalEvent || isNaN(radiusInputValue)) {
                         return;
                     }
-                    gmapContext.radius = $(this).val();
+                    gmapContext.radius = radiusInputValue;
                     GmUtility.setPosition(gmapContext, gmapContext.location, function(context) {
                         context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
                     });
@@ -204,21 +209,23 @@
             }
             if (inputBinding.latitudeInput) {
                 inputBinding.latitudeInput.on("change", function(e) {
-                    if (!e.originalEvent) {
+                    var latitudeInputValue = $(this).val();
+                    if (!e.originalEvent || isNaN(latitudeInputValue)) {
                         return;
                     }
-                    GmUtility.setPosition(gmapContext, new google.maps.LatLng($(this).val(), gmapContext.location.lng()), function(context) {
+                    GmUtility.setPosition(gmapContext, new google.maps.LatLng(latitudeInputValue, gmapContext.location.lng()), function(context) {
                         context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
                         updateInputValues(gmapContext.settings.inputBinding, gmapContext);
                     });
                 });
             }
             if (inputBinding.longitudeInput) {
                 inputBinding.longitudeInput.on("change", function(e) {
-                    if (!e.originalEvent) {
+                    var longitudeInputValue = $(this).val();
+                    if (!e.originalEvent || isNaN(longitudeInputValue)) {
                         return;
                     }
-                    GmUtility.setPosition(gmapContext, new google.maps.LatLng(gmapContext.location.lat(), $(this).val()), function(context) {
+                    GmUtility.setPosition(gmapContext, new google.maps.LatLng(gmapContext.location.lat(), longitudeInputValue), function(context) {
                         context.settings.onchanged.apply(gmapContext.domContainer, [ GmUtility.locationFromLatLng(context.location), context.radius, false ]);
                         updateInputValues(gmapContext.settings.inputBinding, gmapContext);
                     });
@@ -306,7 +313,7 @@
                 return;
             }
             var settings = $.extend({}, $.fn.locationpicker.defaults, options);
-            var gmapContext = new GMapContext(this, {
+            var gmapContext = new GMapContext(this, $.extend({}, settings.mapOptions, {
                 zoom: settings.zoom,
                 center: new google.maps.LatLng(settings.location.latitude, settings.location.longitude),
                 mapTypeId: settings.mapTypeId,
@@ -324,7 +331,7 @@
                 markerIcon: settings.markerIcon,
                 markerDraggable: settings.markerDraggable,
                 markerVisible: settings.markerVisible
-            });
+            }));
             $target.data("locationpicker", gmapContext);
             function displayMarkerWithSelectedArea() {
                 GmUtility.setPosition(gmapContext, gmapContext.marker.position, function(context) {
@@ -369,6 +376,7 @@
         zoom: 15,
         mapTypeId: google.maps.MapTypeId.ROADMAP,
         styles: [],
+        mapOptions: {},
         scrollwheel: true,
         inputBinding: {
             latitudeInput: null,