Skip to content
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

Jump to bottom

Use word boundary matching #1483

Merged
merged 4 commits into from
Jul 31, 2017
Merged

Use word boundary matching #1483

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
114da05
word boundary matching
koenpunt Aug 11, 2013
b9500e0
restored start of string matching
koenpunt Aug 11, 2013
21fa001
removed .test() in favor of .exec(), separated search match function
koenpunt Aug 17, 2013
4cfeb09
restore case sensitive searching
koenpunt Jul 28, 2017
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
28 changes: 9 additions & 19 deletions coffee/lib/abstract-chosen.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ class AbstractChosen
searchText = this.get_search_text()
escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")
regex = this.get_search_regex(escapedSearchText)
highlightRegex = this.get_highlight_regex(escapedSearchText)

for option in @results_data

option.search_match = false
results_group = null
search_match = null

if this.include_option_in_results(option)

Expand All @@ -188,12 +188,14 @@ class AbstractChosen
option.search_text = if option.group then option.label else option.html

unless option.group and not @group_search
option.search_match = this.search_string_match(option.search_text, regex)
search_match = this.search_string_match(option.search_text, regex)
option.search_match = search_match?

results += 1 if option.search_match and not option.group

if option.search_match
if searchText.length
startpos = option.search_text.search highlightRegex
startpos = search_match.index
text = option.search_text.substr(0, startpos + searchText.length) + '</em>' + option.search_text.substr(startpos + searchText.length)
option.search_text = text.substr(0, startpos) + '<em>' + text.substr(startpos)

Expand All @@ -212,25 +214,13 @@ class AbstractChosen
this.winnow_results_set_highlight()

get_search_regex: (escaped_search_string) ->
regex_anchor = if @search_contains then "" else "^"
regex_flag = if @case_sensitive_search then "" else "i"
new RegExp(regex_anchor + escaped_search_string, regex_flag)

get_highlight_regex: (escaped_search_string) ->
regex_anchor = if @search_contains then "" else "\\b"
regex_string = if @search_contains then escaped_search_string else "\\b#{escaped_search_string}\\w*\\b"
regex_string = "^#{regex_string}" unless @enable_split_word_search or @search_contains
regex_flag = if @case_sensitive_search then "" else "i"
new RegExp(regex_anchor + escaped_search_string, regex_flag)
new RegExp(regex_string, regex_flag)

search_string_match: (search_string, regex) ->
if regex.test search_string
return true
else if @enable_split_word_search and (search_string.indexOf(" ") >= 0 or search_string.indexOf("[") == 0)
#TODO: replace this substitution of /\[\]/ with a list of characters to skip.
parts = search_string.replace(/\[|\]/g, "").split(" ")
if parts.length
for part in parts
if regex.test part
return true
regex.exec(search_string)

choices_count: ->
return @selected_option_count if @selected_option_count?
Expand Down