Skip to content

Fixed the bug that when pressing enter the autocomplete value would not ... #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iazi wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixed the bug that when pressing enter the autocomplete value would not ... #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3162fa7
blur autocomplete input after enter press
Apr 10, 2014
c514ae0
Fix javascript + fix focusout + some
heralight Jun 9, 2014
b941778
Fixed the bug that when pressing enter the autocomplete value would n…
joanrodriguez Feb 6, 2015
f2119cc
Merge branch 'master' of https://github.com/gonnado/ngAutocomplete
joanrodriguez Feb 6, 2015
508a2d8
Merged commits, fixed examples
joanrodriguez Feb 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/advanced.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />

<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css"href="/assets/examples/advanced.css">
<link rel="stylesheet" type="text/css"href="/examples/advanced.css">

</head>

Expand Down Expand Up @@ -103,7 +103,7 @@

<div class="form-group move-down">
<label for="Autocomplete2">Autocomplete Model</label>
<input type="text" id="Autocomplete2" ng-model="autocomplete" class="form-control" ng-autocomplete options="options" details="details"/>
<input type="text" id="Autocomplete2" ng-model="autocomplete" class="form-control" ng-map-autocomplete options="options" details="details"/>

<br>
<b>autocomplete</b>: {{autocomplete}}
Expand All @@ -121,9 +121,9 @@
<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?libraries=places&sensor=false"></script>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.4/angular.js"></script>

<script type="text/javascript" src="/assets/src/ngAutocomplete.js"></script>
<script type="text/javascript" src="/assets/examples/advanced.js"></script>
<script type="text/javascript" src="/assets/src/ngAutocomplete.js"></script>
<script type="text/javascript" src="/examples/advanced.js"></script>
<script type="text/javascript" src="/src/ngAutocomplete.js"></script>


</div>

Expand Down
2 changes: 1 addition & 1 deletion examples/advanced.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
angular.module( "Test", ['ngAutocomplete'])
angular.module( "Test", ['ngMapAutocomplete'])
.controller("TestCtrl",function ($scope) {

$scope.result = ''
Expand Down
304 changes: 169 additions & 135 deletions src/ngAutocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
'use strict';
/*!
The MIT License

Copyright (c) 2014 Will Palahnuk

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/


/**
* A directive for adding google places autocomplete to a text box
Expand All @@ -25,142 +48,153 @@
* types: '(cities)',
* country: 'ca'
* }
<<<<<<< HEAD
**/

angular.module( "ngAutocomplete", [])
.directive('ngAutocomplete', function() {
return {
require: 'ngModel',
scope: {
ngModel: '=',
options: '=?',
details: '=?'
},

link: function(scope, element, attrs, controller) {

//options for autocomplete
var opts
var watchEnter = false
//convert options provided to opts
var initOpts = function() {

opts = {}
if (scope.options) {

if (scope.options.watchEnter !== true) {
watchEnter = false
} else {
watchEnter = true
}

if (scope.options.types) {
opts.types = []
opts.types.push(scope.options.types)
scope.gPlace.setTypes(opts.types)
} else {
scope.gPlace.setTypes([])
}

if (scope.options.bounds) {
opts.bounds = scope.options.bounds
scope.gPlace.setBounds(opts.bounds)
} else {
scope.gPlace.setBounds(null)
}

if (scope.options.country) {
opts.componentRestrictions = {
country: scope.options.country
}
scope.gPlace.setComponentRestrictions(opts.componentRestrictions)
} else {
scope.gPlace.setComponentRestrictions(null)
}
}
}

if (scope.gPlace == undefined) {
scope.gPlace = new google.maps.places.Autocomplete(element[0], {});
}
google.maps.event.addListener(scope.gPlace, 'place_changed', function() {
var result = scope.gPlace.getPlace();
if (result !== undefined) {
if (result.address_components !== undefined) {

scope.$apply(function() {

scope.details = result;

controller.$setViewValue(element.val());
});
}
else {
if (watchEnter) {
getPlace(result)
}
}
}
})

//function to get retrieve the autocompletes first result using the AutocompleteService
var getPlace = function(result) {
var autocompleteService = new google.maps.places.AutocompleteService();
if (result.name.length > 0){
autocompleteService.getPlacePredictions(
{
input: result.name,
offset: result.name.length
},
function listentoresult(list, status) {
if(list == null || list.length == 0) {

scope.$apply(function() {
scope.details = null;
});

} else {
var placesService = new google.maps.places.PlacesService(element[0]);
placesService.getDetails(
{'reference': list[0].reference},
function detailsresult(detailsResult, placesServiceStatus) {

if (placesServiceStatus == google.maps.GeocoderStatus.OK) {
scope.$apply(function() {

controller.$setViewValue(detailsResult.formatted_address);
element.val(detailsResult.formatted_address);

scope.details = detailsResult;

//on focusout the value reverts, need to set it again.
var watchFocusOut = element.on('focusout', function(event) {
element.val(detailsResult.formatted_address);
element.unbind('focusout')
})

});
}
angular.module("ngMapAutocomplete", [])
.directive('ngMapAutocomplete', [ '$timeout', function ($timeout) {
return {
require: 'ngModel',
scope: {
ngModel: '=ngModel',
options: '=?',
details: '=?'
},
link: function (scope, element, attrs, ngModel) {
if (!ngModel) {
return;
}// do nothing if no ng-model
//options for autocomplete
var opts;
var watchEnter = false;

//convert options provided to opts
var initOpts = function () {

opts = {};
if (scope.options) {

watchEnter = scope.options.watchEnter === true;

if (scope.options.types) {
opts.types = [];
opts.types.push(scope.options.types);
scope.gPlace.setTypes(opts.types);
} else {
scope.gPlace.setTypes([]);
}

if (scope.options.bounds) {
opts.bounds = scope.options.bounds;
scope.gPlace.setBounds(opts.bounds);
} else {
scope.gPlace.setBounds(null);
}

if (scope.options.country) {
opts.componentRestrictions = {
country: scope.options.country
};
scope.gPlace.setComponentRestrictions(opts.componentRestrictions);
} else {
scope.gPlace.setComponentRestrictions(null);
}
}
);
}
});
}
}
};

controller.$render = function () {
var location = controller.$viewValue;
element.val(location);
};

//watch options provided to directive
scope.watchOptions = function () {
return scope.options
if (scope.gPlace === undefined) {
scope.gPlace = new google.maps.places.Autocomplete(element[0], {});
}
google.maps.event.addListener(scope.gPlace, 'place_changed', function () {
var result = scope.gPlace.getPlace();
if (result !== undefined) {
if (result.address_components !== undefined) {

scope.$apply(function () {

scope.details = result;
scope.details.description = element.val();
ngModel.$setViewValue(element.val());
});
}
else {
if (watchEnter) {
getPlace(result);
}
}
}
});


//function to get retrieve the autocompletes first result using the AutocompleteService
var getPlace = function (result) {
var autocompleteService = new google.maps.places.AutocompleteService();
if (result.name.length > 0) {
autocompleteService.getPlacePredictions(
{
input: result.name,
offset: result.name.length
},
function listentoresult(list, status) {
if (list === null || list.length === 0) {

scope.$apply(function () {
scope.details = null;
});

} else {
var placesService = new google.maps.places.PlacesService(element[0]);
placesService.getDetails(
{'reference': list[0].reference},
function detailsresult(detailsResult, placesServiceStatus) {

if (placesServiceStatus === google.maps.GeocoderStatus.OK) {
scope.$apply(function () {
//detailsResult.formatted_address = list[0].description;
detailsResult.description = list[0].description;
ngModel.$setViewValue(detailsResult.formatted_address);
element.val(detailsResult.formatted_address);

scope.details = detailsResult;

// //on focusout the value reverts, need to set it again.
// var watchFocusOut = element.on('focusout', function(event) {
// element.val(detailsResult.formatted_address);
// event.preventDefault();
// element.unbind('focusout');
// });

});
}
}
);
}
});
}
};

ngModel.$render = function () {
var location = ngModel.$viewValue;
element.val(location);
};

//watch options provided to directive
scope.watchOptions = function () {
return scope.options;
};
scope.$watch(scope.watchOptions, function () {
initOpts();
}, true);

//on focusout the value reverts, need to set it again.
// with a timer to prevent maps event bug
element.on('focusout', function (event) {
$timeout(function () {
element.val(ngModel.$viewValue);
event.preventDefault();
}, 2, false);
// element.unbind('focusout');
});
}
};
scope.$watch(scope.watchOptions, function () {
initOpts()
}, true);

}
};
});
}]);