Merge 3a081d5 into bc0f0bd

mbenford · Sep 15, 2014 · 35403f8 · 35403f8
2 parents bc0f0bd + 3a081d5
commit 35403f8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/tags-input.js b/src/tags-input.js
@@ -210,9 +210,17 @@ tagsInput.directive('tagsInput', function($timeout, $document, tagsInputConfig)
                     scope.newTag.invalid = null;
                 })
                 .on('input-focus', function() {
+
+                    // focus outer element
+                    element.triggerHandler('focus');
+
                     ngModelCtrl.$setValidity('leftoverText', true);
                 })
                 .on('input-blur', function() {
+
+                    // blur outer element
+                    element.triggerHandler('blur');
+
                     if (!options.addFromAutocompleteOnly) {
                         if (options.addOnBlur) {
                             tagList.addText(scope.newTag.text);

diff --git a/test/tags-input.spec.js b/test/tags-input.spec.js
@@ -338,6 +338,34 @@ describe('tags-input directive', function() {
             // Assert
             expect($scope.$digest).not.toHaveBeenCalled();
         });
+
+        it('focuses the directive element when the input field receives focus', function() {
+            // Arrange
+            $scope.callback = jasmine.createSpy();
+            compile('ng-focus="callback()"');
+            var input = getInput()[0];
+
+            // Act
+            getInput().triggerHandler('focus');
+            $timeout.flush();
+
+            // Assert
+            expect($scope.callback).toHaveBeenCalled();
+        });
+
+        it('blurs the directive element when the input field loses focus', function() {
+            // Arrange
+            $scope.callback = jasmine.createSpy();
+            compile('ng-blur="callback()"');
+            var input = getInput()[0];
+
+            // Act
+            getInput().triggerHandler('blur');
+            $timeout.flush();
+
+            // Assert
+            expect($scope.callback).toHaveBeenCalled();
+        });
     });
 
     describe('tabindex option', function() {