fix(typeahead): allow multiple line expression

introduce [\s\S]+ to include both whitespace and non whitespace characters Fixes angular-ui#1687 Closes angular-ui#1850
bekos · May 6, 2014 · c7db0df · c7db0df
1 parent aa188ae
commit c7db0df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/typeahead/test/typeahead.spec.js b/src/typeahead/test/typeahead.spec.js
@@ -150,6 +150,16 @@ describe('typeahead tests', function () {
       expect(inputEl.attr('aria-activedescendant')).toBeUndefined();
     });
 
+    it('should allow expressions over multiple lines', function () {
+      var element = prepareInputEl('<div><input ng-model="result" typeahead="item for item in source \n' +
+        '| filter:$viewValue"></div>');
+      changeInputValueTo(element, 'ba');
+      expect(element).toBeOpenWithActive(2, 0);
+
+      changeInputValueTo(element, '');
+      expect(element).toBeClosed();
+    });
+
     it('should not open typeahead if input value smaller than a defined threshold', function () {
       var element = prepareInputEl('<div><input ng-model="result" typeahead="item for item in source | filter:$viewValue" typeahead-min-length="2"></div>');
       changeInputValueTo(element, 'b');

diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js
@@ -7,7 +7,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap
   .factory('typeaheadParser', ['$parse', function ($parse) {
 
   //                      00000111000000000000022200000000000000003333333333333330000000000044000
-  var TYPEAHEAD_REGEXP = /^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;
+  var TYPEAHEAD_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
 
   return {
     parse:function (input) {