From 1c995bbc3c038838725d09b56a3b78f614799ccd Mon Sep 17 00:00:00 2001 From: Daniel Camargo Date: Tue, 8 Oct 2013 21:15:31 -0300 Subject: [PATCH] location message fixed --- www/assets/js/controllers.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/www/assets/js/controllers.js b/www/assets/js/controllers.js index b2b15440e..7c4aede0c 100644 --- a/www/assets/js/controllers.js +++ b/www/assets/js/controllers.js @@ -283,6 +283,7 @@ NGApp.controller( 'LocationCtrl', function ($scope, $http, $location, $rootScope var entered = $scope.location.position.pos().entered(); var isStreet = $scope.location.position.pos().valid( 'order' ); if( isStreet && !entered.match(new RegExp( /\d{5}(?:[-\s]\d{4})?/ )) ){ + $('.location-address').val('').attr('placeholder','Please include a zip code'); $scope.$broadcast( 'locationNotServed', true ); } else { $scope.locationError = true; @@ -297,7 +298,13 @@ NGApp.controller( 'LocationCtrl', function ($scope, $http, $location, $rootScope spin.stop(); var pos = PositionsService.pos(); if( pos.type() == 'user' ){ - $('.location-address').val('').attr('placeholder','Please include a zip code or city name'); + var entered = $scope.location.position.pos().entered(); + var isStreet = $scope.location.position.pos().valid( 'order' ); + if( isStreet && !entered.match(new RegExp( /\d{5}(?:[-\s]\d{4})?/ )) ){ + $('.location-address').val('').attr('placeholder','Please include a zip code'); + } else { + $('.location-address').val('').attr('placeholder','Please include a zip code or city name'); + } } else { $('.location-address').val('').attr('placeholder','Please enter an address or zip'); }