CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-23 08:39:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename countryCode->code to avoid rollup name collision bug

Browse Source
This commit is contained in:
Bryan Housel
2016-10-05 23:01:56 -04:00
parent 06b9b4207b
commit 7f61d36a5e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/fields/combo.js
+5 -5
View File
@@ -26,7 +26,7 @@ export function uiFieldCombo(field, context) {
container,
input,
entity,
countryCode;
country;
// ensure multiCombo field.key ends with a ':'
if (isMulti && field.key.match(/:$/) === null) {
@@ -147,9 +147,9 @@ export function uiFieldCombo(field, context) {
function setTaginfoValues(q, callback) {
var fn = isMulti ? 'multikeys' : 'values';
var query = (isMulti ? field.key : '') + q;
var hasCountryPrefix = isNetwork && countryCode && countryCode.indexOf(q.toLowerCase()) === 0;
var hasCountryPrefix = isNetwork && country && country.indexOf(q.toLowerCase()) === 0;
if (hasCountryPrefix) {
query = countryCode + ':';
query = country + ':';
}
context.taginfo()[fn]({
debounce: true,
@@ -160,7 +160,7 @@ export function uiFieldCombo(field, context) {
if (err) return;
if (hasCountryPrefix) {
data = _.filter(data, function(d) {
return d.value.toLowerCase().indexOf(countryCode + ':') === 0;
return d.value.toLowerCase().indexOf(country + ':') === 0;
});
}
comboData = _.map(data, function(d) {
@@ -252,7 +252,7 @@ export function uiFieldCombo(field, context) {
var center = entity.extent(context.graph()).center();
serviceNominatim.init();
serviceNominatim.countryCode(center, function (err, code) {
countryCode = code;
country = code;
});
}