Make typeahead respect ngModelOptions="{getterSetter: true}"

pkarikh · Jun 17, 2015 · 6baf354 · 6baf354
1 parent 49e73a8
commit 6baf354
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js
@@ -67,7 +67,27 @@ angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap
       //INTERNAL VARIABLES
 
       //model setter executed upon match selection
-      var $setModelValue = $parse(attrs.ngModel).assign;
+      var $setModelValue = (function() {
+        var options = $parse(attrs.ngModelOptions)(),
+          parsedNgModel = $parse(attrs.ngModel),
+          parsedNgModelAssign = $parse(attrs.ngModel).assign,
+          ngModelSet;
+        if (options && options.getterSetter) {
+          var invokeModelSetter = $parse(attrs.ngModel + '($$$p)');
+
+          ngModelSet = function($scope, newValue) {
+            if (angular.isFunction(parsedNgModel($scope))) {
+              invokeModelSetter($scope, {
+                $$$p: newValue
+              });
+            } else {
+              parsedNgModelAssign($scope, modelCtrl.$modelValue);
+            }
+          };
+        }
+
+        return ngModelSet || parsedNgModelAssign;
+      })();
 
       //expressions used by typeahead
       var parserResult = typeaheadParser.parse(attrs.typeahead);