Skip to content

Fixing regexes #163

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

Closed
wants to merge 1 commit into from
Closed

Fixing regexes #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions 06 - Type Ahead/index-FINISHED.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@
.then(blob => blob.json())
.then(data => cities.push(...data));

function escapeRegExp(str) {
return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
}

function findMatches(wordToMatch, cities) {
return cities.filter(place => {
// here we need to figure out if the city or state matches what was searched
const regex = new RegExp(wordToMatch, 'gi');
const regex = new RegExp(escapeRegExp(wordToMatch), 'gi');
return place.city.match(regex) || place.state.match(regex)
});
}
Expand All @@ -37,9 +41,9 @@
function displayMatches() {
const matchArray = findMatches(this.value, cities);
const html = matchArray.map(place => {
const regex = new RegExp(this.value, 'gi');
const cityName = place.city.replace(regex, `<span class="hl">${this.value}</span>`);
const stateName = place.state.replace(regex, `<span class="hl">${this.value}</span>`);
const regex = new RegExp("(" + escapeRegExp(this.value) + ")", 'gi');
const cityName = place.city.replace(regex, `<span class="hl">$1</span>`);
const stateName = place.state.replace(regex, `<span class="hl">$1</span>`);
return `
<li>
<span class="name">${cityName}, ${stateName}</span>
Expand Down