fix(typeahead): correctly higlight matches if query contains regexp-s…

…pecial chars

Closes #316

src/typeahead/test/typeahead.spec.js

@@ -142,6 +142,34 @@ describe('typeahead tests', function () {
  });
  });
 
+ describe('typeaheadHighlight', function () {
+
+ var highlightFilter;
+ beforeEach(inject(function (typeaheadHighlightFilter) {
+ highlightFilter = typeaheadHighlightFilter;
+ }));
+
+ it('should higlight a match', function () {
+ expect(highlightFilter('before match after', 'match')).toEqual('before <strong>match</strong> after');
+ });
+
+ it('should higlight a match with mixed case', function () {
+ expect(highlightFilter('before MaTch after', 'match')).toEqual('before <strong>MaTch</strong> after');
+ });
+
+ it('should higlight all matches', function () {
+ expect(highlightFilter('before MaTch after match', 'match')).toEqual('before <strong>MaTch</strong> after <strong>match</strong>');
+ });
+
+ it('should do nothing if no match', function () {
+ expect(highlightFilter('before match after', 'nomatch')).toEqual('before match after');
+ });
+
+ it('issue 316 - should work correctly for regexp reserved words', function () {
+ expect(highlightFilter('before (match after', '(match')).toEqual('before <strong>(match</strong> after');
+ });
+ });
+
  describe('typeahead', function () {
 
  var $scope, $compile, $document;

src/typeahead/typeahead.js

@@ -207,7 +207,12 @@ angular.module('ui.bootstrap.typeahead', [])
  })
 
  .filter('typeaheadHighlight', function() {
+
+ function escapeRegexp(queryToEscape) {
+ return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+ }
+
  return function(matchItem, query) {
- return (query) ? matchItem.replace(new RegExp(query, 'gi'), '<strong>$&</strong>') : query;
+ return query ? matchItem.replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : query;
  };
  });