CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 13:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Better search fail state (fixes #1655)

Browse Source
This commit is contained in:
John Firebaugh
2013-07-29 16:50:27 -07:00
parent 533071a558
commit 369ba567c9
4 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+1
View File
@@ -765,6 +765,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
width:100%;
}
.no-results-item,
.geocode-item,
.feature-list-item {
width: 100%;
data/core.yaml
+3 -2
View File
@@ -164,8 +164,9 @@ en:
list: "Edits by {users}"
truncated_list: "Edits by {users} and {count} others"
geocoder:
search: Continue search on server...
no_results: No results found
search: Search worldwide...
no_results_visible: No results in visible map area
no_results_worldwide: No results found
geolocate:
title: Show My Location
inspector:
dist/locales/en.json
Vendored
+3 -2
View File
@@ -205,8 +205,9 @@
"truncated_list": "Edits by {users} and {count} others"
},
"geocoder": {
"search": "Continue search on server...",
"no_results": "No results found"
"search": "Search worldwide...",
"no_results_visible": "No results in visible map area",
"no_results_worldwide": "No results found"
},
"geolocate": {
"title": "Show My Location"
js/id/ui/feature_list.js
+31 -16
View File
@@ -98,32 +98,47 @@ iD.ui.FeatureList = function(context) {
}
function drawList() {
var value = search.property('value');
var value = search.property('value'),
results = features();
list.classed('filtered', value.length);
var geocodeButton = list.selectAll('.geocode-item')
var noResultsWorldwide = geocodeResults && geocodeResults.length === 0;
var resultsIndicator = list.selectAll('.no-results-item')
.data([0])
.enter().append('button')
.property('disabled', true)
.attr('class', 'no-results-item');
resultsIndicator.append('span')
.attr('class', 'icon alert');
resultsIndicator.append('span')
.attr('class', 'entity-name');
list.selectAll('.no-results-item .entity-name')
.text(noResultsWorldwide ? t('geocoder.no_results_worldwide') : t('geocoder.no_results_visible'));
list.selectAll('.geocode-item')
.data([0])
.enter().append('button')
.attr('class', 'geocode-item')
.on('click', geocode);
.on('click', geocode)
.append('div')
.attr('class', 'label')
.append('span')
.attr('class', 'entity-name')
.text(t('geocoder.search'));
var label = geocodeButton.append('div')
.attr('class', 'label');
label.append('span')
.attr('class', 'entity-name');
var noResults = geocodeResults && geocodeResults.length === 0;
list.selectAll('.no-results-item')
.style('display', (value.length && !results.length) ? 'block' : 'none');
list.selectAll('.geocode-item')
.style('display', noResults || (value && geocodeResults === undefined) ? 'block' : 'none')
.property('disabled', noResults)
.selectAll('.entity-name')
.text(noResults ? t('geocoder.no_results') : t('geocoder.search'));
.style('display', (value && geocodeResults === undefined) ? 'block' : 'none');
var items = list.selectAll('.feature-list-item')
.data(features(), function(d) { return d.id; });
.data(results, function(d) { return d.id; });
var enter = items.enter().insert('button', '.geocode-item')
.attr('class', 'feature-list-item')
@@ -131,7 +146,7 @@ iD.ui.FeatureList = function(context) {
.on('mouseout', mouseout)
.on('click', click);
label = enter.append('div')
var label = enter.append('div')
.attr('class', 'label');
label.append('span')