diff options
| author | mistic100 <mistic@piwigo.org> | 2013-06-15 13:54:26 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2013-06-15 13:54:26 +0000 |
| commit | 4afb44fa21f893e83030c10d9afd7304c5f397b5 (patch) | |
| tree | b0d3f56eb907e015fee1cc29a502b95713825059 /themes/default/js | |
| parent | 3c74f3ff2708ac5a80d17e4cf281e368dd0b4cf0 (diff) | |
Merged revision(s) 23229 from trunk:
bug:2921 Can't create tags with special chars like ( + [
https://github.com/MartinKoerner/jquery-tokeninput/commit/cc8eab541ad1371c6f0c6730c0154908eb105f5d
git-svn-id: http://piwigo.org/svn/branches/2.5@23230 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes/default/js')
| -rw-r--r-- | themes/default/js/plugins/jquery.tokeninput.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/themes/default/js/plugins/jquery.tokeninput.js b/themes/default/js/plugins/jquery.tokeninput.js index 0c8662b3b..c36a864f2 100644 --- a/themes/default/js/plugins/jquery.tokeninput.js +++ b/themes/default/js/plugins/jquery.tokeninput.js @@ -576,7 +576,12 @@ $.TokenList = function (input, url_or_data, settings) { // Highlight the query part of the search term function highlight_term(value, term) { - return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>"); + return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + escape_regexp_chars(term) + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>"); + } + + function escape_regexp_chars(string) { + var specials = new RegExp("[.*+?|()\\[\\]{}\\\\]", "g"); // .*+?|()[]{}\ + return string.replace(specials, "\\$&"); } // Populate the results dropdown with some results |