diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-03-26 12:45:32 -0400 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-03-26 12:45:32 -0400 |
| commit | f1933142e485ceaaef9ef52e56abb9f43eaaad2d (patch) | |
| tree | 3b70640ecf55aa40bee9c3c9946268792e39ba30 /demos | |
| parent | e8f397bc145ffd9de4441a269e0d45c5fe1fa9cf (diff) | |
| parent | 6d9caf1e230b7b9a4291a8e3525eefad2f08b6f8 (diff) | |
| download | jquery-ui-f1933142e485ceaaef9ef52e56abb9f43eaaad2d.tar.gz jquery-ui-f1933142e485ceaaef9ef52e56abb9f43eaaad2d.zip | |
Merge branch 'master' into tooltip
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/autocomplete/combobox.html | 2 | ||||
| -rw-r--r-- | demos/autocomplete/remote.html | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html index e5dc6c92b..4c6b656a1 100644 --- a/demos/autocomplete/combobox.html +++ b/demos/autocomplete/combobox.html @@ -33,7 +33,7 @@ if (!request.term || matcher.test(text)) return { id: $(this).val(), - label: text.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + request.term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>"), + label: text.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + $.ui.autocomplete.escapeRegex(request.term) + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>"), value: text }; })); diff --git a/demos/autocomplete/remote.html b/demos/autocomplete/remote.html index 3b0d7096d..9414102e6 100644 --- a/demos/autocomplete/remote.html +++ b/demos/autocomplete/remote.html @@ -18,7 +18,6 @@ } $("#birds").autocomplete({ - // TODO doesn't work when loaded from /demos/#autocomplete|remote source: "search.php", minLength: 2, select: function(event, ui) { |