fix(typeahead): play nicelly with existing formatters

src/typeahead/test/typeahead.spec.js

@@ -5,6 +5,18 @@ describe('typeahead tests', function () {
 
   beforeEach(module('ui.bootstrap.typeahead'));
   beforeEach(module('template/typeahead/typeahead.html'));
+  beforeEach(module(function($compileProvider) {
+    $compileProvider.directive('formatter', function () {
+      return {
+        require: 'ngModel',
+        link: function (scope, elm, attrs, ngModelCtrl) {
+          ngModelCtrl.$formatters.unshift(function (viewVal) {
+            return 'formatted' + viewVal;
+          });
+        }
+      };
+    });
+  }));
   beforeEach(inject(function (_$rootScope_, _$compile_, _$document_, $sniffer) {
     $scope = _$rootScope_;
     $scope.source = ['foo', 'bar', 'baz'];
@@ -237,7 +249,7 @@ describe('typeahead tests', function () {
       expect($scope.$label).toEqual('Alaska');
     });
 
-    it('should correctly update inputs value on mapping where label is not derived from the model', function () {
+    xit('should correctly update inputs value on mapping where label is not derived from the model', function () {
 
       $scope.states = [
         {code: 'AL', name: 'Alaska'},
@@ -270,4 +282,20 @@ describe('typeahead tests', function () {
     });
   });
 
+  describe('integration with existing formatters', function () {
+
+    it('should co-operate with existing formatters', function () {
+
+      $scope.states = [
+        {code: 'AL', name: 'Alaska'},
+        {code: 'CL', name: 'California'}
+      ];
+      $scope.result = $scope.states[0];
+
+      var element = prepareInputEl("<div><input ng-model='result.name' formatter typeahead='state.name for state in states | filter:$viewValue'></div>"),
+      inputEl = findInput(element);
+
+      expect(inputEl.val()).toEqual('formatted' + $scope.result.name);
+    });
+  });
 });

src/typeahead/typeahead.js

@@ -37,7 +37,7 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position'])
     require:'ngModel',
     link:function (originalScope, element, attrs, modelCtrl) {
 
-      var selected;
+      var $setModelValue = $parse(attrs.ngModel).assign;
 
       //minimal no of characters that needs to be entered before typeahead kicks-in
       var minSearch = originalScope.$eval(attrs.typeaheadMinLength) || 1;
@@ -130,48 +130,47 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position'])
         var timeoutId;
 
         resetMatches();
-        if (selected) {
-          return inputValue;
-        } else {
-          if (inputValue && inputValue.length >= minSearch) {
-            if (waitTime > 0) {
-              if (timeoutId) {
-                $timeout.cancel(timeoutId);//cancel previous timeout
-              }
-              timeoutId = $timeout(function () {
-                getMatchesAsync(inputValue);
-              }, waitTime);
-            } else {
-              getMatchesAsync(inputValue);
+        if (inputValue && inputValue.length >= minSearch) {
+          if (waitTime > 0) {
+            if (timeoutId) {
+              $timeout.cancel(timeoutId);//cancel previous timeout
             }
+            timeoutId = $timeout(function () {
+              getMatchesAsync(inputValue);
+            }, waitTime);
+          } else {
+            getMatchesAsync(inputValue);
           }
         }
 
         return isEditable ? inputValue : undefined;
       });
 
-      modelCtrl.$render = function () {
-        var locals = {};
-        locals[parserResult.itemName] = selected || modelCtrl.$viewValue;
-        element.val(parserResult.viewMapper(scope, locals) || modelCtrl.$viewValue);
-        selected = undefined;
-      };
+      modelCtrl.$formatters.push(function (modelValue) {
+        var locals = {}, viewValue;
+        locals[parserResult.itemName] = modelValue;
+
+        viewValue = parserResult.viewMapper(originalScope, locals);
+
+        return viewValue ? viewValue : modelValue;
+      });
 
       scope.select = function (activeIdx) {
         //called from within the $digest() cycle
         var locals = {};
         var model, item;
-        locals[parserResult.itemName] = item = selected = scope.matches[activeIdx].model;
 
-        model = parserResult.modelMapper(scope, locals);
-        modelCtrl.$setViewValue(model);
-        modelCtrl.$render();
-        onSelectCallback(scope, {
+        locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
+        model = parserResult.modelMapper(originalScope, locals);
+        $setModelValue(originalScope, model);
+
+        onSelectCallback(originalScope, {
           $item: item,
           $model: model,
-          $label: parserResult.viewMapper(scope, locals)
+          $label: parserResult.viewMapper(originalScope, locals)
         });
 
+        //return focus to the input element if a mach was selected via a mouse click event
         element[0].focus();
       };
 
@@ -259,4 +258,4 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position'])
     return function(matchItem, query) {
       return query ? matchItem.replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : query;
     };
-  });
+  });