Skip to content

Commit 88c82ba

Browse files
CyberAPCyberAP
committed
Small fixes, added builds
1 parent 8ef0cbc commit 88c82ba

File tree

5 files changed

+92
-36
lines changed

5 files changed

+92
-36
lines changed

‎build/scripts/ng-map.debug.js‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -751,8 +751,15 @@ angular.module('ngMap', []);
751751
'durationInTraffic', 'waypoints', 'optimizeWaypoints',
752752
'provideRouteAlternatives', 'avoidHighways', 'avoidTolls', 'region'
753753
];
754-
for(var key in request){
755-
(validKeys.indexOf(key) === -1) && (delete request[key]);
754+
if (request)
755+
{
756+
for(var key in request)
757+
{
758+
if (request.hasOwnProperty(key))
759+
{
760+
(validKeys.indexOf(key) === -1) && (delete request[key]);
761+
}
762+
}
756763
}
757764

758765
if(request.waypoints) {
@@ -763,13 +770,20 @@ angular.module('ngMap', []);
763770
}
764771

765772
var showDirections = function(request) {
766-
if (requestTimeout) {
767-
for (var attr in request)
773+
if (requestTimeout && request) {
774+
if (!routeRequest)
768775
{
769-
if (request.hasOwnProperty(attr))
770-
{
771-
routeRequest[attr] = request[attr];
772-
}
776+
routeRequest = request;
777+
}
778+
else
779+
{
780+
for (var attr in request)
781+
{
782+
if (request.hasOwnProperty(attr))
783+
{
784+
routeRequest[attr] = request[attr];
785+
}
786+
}
773787
}
774788
}
775789
else
@@ -789,7 +803,7 @@ angular.module('ngMap', []);
789803
}
790804
};
791805

792-
if (request.origin && request.destination) {
806+
if (request && request.origin && request.destination) {
793807
if (request.origin == 'current-location') {
794808
NavigatorGeolocation.getCurrentPosition().then(function(ll) {
795809
request.origin = new google.maps.LatLng(ll.coords.latitude, ll.coords.longitude);

‎build/scripts/ng-map.js‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,15 @@ angular.module('ngMap', []);
760760
'durationInTraffic', 'waypoints', 'optimizeWaypoints',
761761
'provideRouteAlternatives', 'avoidHighways', 'avoidTolls', 'region'
762762
];
763-
for(var key in request){
764-
(validKeys.indexOf(key) === -1) && (delete request[key]);
763+
if (request)
764+
{
765+
for(var key in request)
766+
{
767+
if (request.hasOwnProperty(key))
768+
{
769+
(validKeys.indexOf(key) === -1) && (delete request[key]);
770+
}
771+
}
765772
}
766773

767774
if(request.waypoints) {
@@ -772,13 +779,20 @@ angular.module('ngMap', []);
772779
}
773780

774781
var showDirections = function(request) {
775-
if (requestTimeout) {
776-
for (var attr in request)
782+
if (requestTimeout && request) {
783+
if (!routeRequest)
777784
{
778-
if (request.hasOwnProperty(attr))
779-
{
780-
routeRequest[attr] = request[attr];
781-
}
785+
routeRequest = request;
786+
}
787+
else
788+
{
789+
for (var attr in request)
790+
{
791+
if (request.hasOwnProperty(attr))
792+
{
793+
routeRequest[attr] = request[attr];
794+
}
795+
}
782796
}
783797
}
784798
else
@@ -798,7 +812,7 @@ angular.module('ngMap', []);
798812
}
799813
};
800814

801-
if (request.origin && request.destination) {
815+
if (request && request.origin && request.destination) {
802816
if (request.origin == 'current-location') {
803817
NavigatorGeolocation.getCurrentPosition().then(function(ll) {
804818
request.origin = new google.maps.LatLng(ll.coords.latitude, ll.coords.longitude);

‎build/scripts/ng-map.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/scripts/ng-map.no-dependency.js‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -760,8 +760,15 @@ angular.module('ngMap', []);
760760
'durationInTraffic', 'waypoints', 'optimizeWaypoints',
761761
'provideRouteAlternatives', 'avoidHighways', 'avoidTolls', 'region'
762762
];
763-
for(var key in request){
764-
(validKeys.indexOf(key) === -1) && (delete request[key]);
763+
if (request)
764+
{
765+
for(var key in request)
766+
{
767+
if (request.hasOwnProperty(key))
768+
{
769+
(validKeys.indexOf(key) === -1) && (delete request[key]);
770+
}
771+
}
765772
}
766773

767774
if(request.waypoints) {
@@ -772,13 +779,20 @@ angular.module('ngMap', []);
772779
}
773780

774781
var showDirections = function(request) {
775-
if (requestTimeout) {
776-
for (var attr in request)
782+
if (requestTimeout && request) {
783+
if (!routeRequest)
777784
{
778-
if (request.hasOwnProperty(attr))
779-
{
780-
routeRequest[attr] = request[attr];
781-
}
785+
routeRequest = request;
786+
}
787+
else
788+
{
789+
for (var attr in request)
790+
{
791+
if (request.hasOwnProperty(attr))
792+
{
793+
routeRequest[attr] = request[attr];
794+
}
795+
}
782796
}
783797
}
784798
else
@@ -798,7 +812,7 @@ angular.module('ngMap', []);
798812
}
799813
};
800814

801-
if (request.origin && request.destination) {
815+
if (request && request.origin && request.destination) {
802816
if (request.origin == 'current-location') {
803817
NavigatorGeolocation.getCurrentPosition().then(function(ll) {
804818
request.origin = new google.maps.LatLng(ll.coords.latitude, ll.coords.longitude);

‎directives/directions.js‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,15 @@
5959
'durationInTraffic', 'waypoints', 'optimizeWaypoints',
6060
'provideRouteAlternatives', 'avoidHighways', 'avoidTolls', 'region'
6161
];
62-
for(var key in request){
63-
(validKeys.indexOf(key) === -1) && (delete request[key]);
62+
if (request)
63+
{
64+
for(var key in request)
65+
{
66+
if (request.hasOwnProperty(key))
67+
{
68+
(validKeys.indexOf(key) === -1) && (delete request[key]);
69+
}
70+
}
6471
}
6572

6673
if(request.waypoints) {
@@ -71,12 +78,19 @@
7178
}
7279

7380
var showDirections = function(request) {
74-
if (requestTimeout) {
75-
for (var attr in request)
81+
if (requestTimeout && request) {
82+
if (!routeRequest)
7683
{
77-
if (request.hasOwnProperty(attr))
84+
routeRequest = request;
85+
}
86+
else
87+
{
88+
for (var attr in request)
7889
{
79-
routeRequest[attr] = request[attr];
90+
if (request.hasOwnProperty(attr))
91+
{
92+
routeRequest[attr] = request[attr];
93+
}
8094
}
8195
}
8296
}
@@ -97,7 +111,7 @@
97111
}
98112
};
99113

100-
if (request.origin && request.destination) {
114+
if (request && request.origin && request.destination) {
101115
if (request.origin == 'current-location') {
102116
NavigatorGeolocation.getCurrentPosition().then(function(ll) {
103117
request.origin = new google.maps.LatLng(ll.coords.latitude, ll.coords.longitude);

0 commit comments

Comments
 (0)