refactored focus setting, finally fixed #50

Author: dnauck

src/angular-advanced-searchbox.html

@@ -1,4 +1,4 @@
-<div class="advancedSearchBox" ng-class="{active:focus}" ng-init="focus = false" ng-click="!focus ? setSearchFocus = true : null">
+<div class="advancedSearchBox" ng-class="{active:focus}" ng-init="focus = false" ng-click="!focus ? setFocusFor('searchbox') : null">
     <span ng-show="searchParams.length < 1 && searchQuery.length === 0" class="search-icon glyphicon glyphicon-search"></span>
     <a ng-href="" ng-show="searchParams.length > 0 || searchQuery.length > 0" ng-click="removeAll()" role="button">
         <span class="remove-all-icon glyphicon glyphicon-trash"></span>
@@ -14,7 +14,7 @@
                 <input name="value"
                        type="{{searchParam.type}}"
                        nit-auto-size-input
-                       nit-set-focus="searchParam.editMode"
+                       set-focus-on="{{'searchParam:' + searchParam.key}}"
                        ng-keydown="keydown($event, $index)"
                        ng-blur="leaveEditMode($event, $index)"
                        ng-show="searchParam.editMode"
@@ -33,7 +33,7 @@
                class="search-parameter-input"
                type="text"
                nit-auto-size-input
-               nit-set-focus="setSearchFocus"
+               set-focus-on="searchbox"
                ng-keydown="keydown($event)"
                placeholder="{{placeholder}}"
                ng-focus="focus = true"

src/angular-advanced-searchbox.js

@@ -27,16 +27,16 @@ angular.module('angular-advanced-searchbox', [])
                 return attr.templateUrl || 'angular-advanced-searchbox.html';
             },
             controller: [
-                '$scope', '$attrs', '$element', '$timeout', '$filter',
-                function ($scope, $attrs, $element, $timeout, $filter) {
+                '$scope', '$attrs', '$element', '$timeout', '$filter', 'setFocusFor',
+                function ($scope, $attrs, $element, $timeout, $filter, setFocusFor) {
 
                     $scope.parametersLabel = $scope.parametersLabel || 'Parameter Suggestions';
                     $scope.parametersDisplayLimit = $scope.parametersDisplayLimit || 8;
                     $scope.placeholder = $scope.placeholder || 'Search ...';
                     $scope.searchThrottleTime = $scope.searchThrottleTime || 1000;
                     $scope.searchParams = [];
                     $scope.searchQuery = '';
-                    $scope.setSearchFocus = false;
+                    $scope.setFocusFor = setFocusFor;
                     var searchThrottleTimer;
                     var changeBuffer = [];
 
@@ -116,6 +116,7 @@ angular.module('angular-advanced-searchbox', [])
 
                         var searchParam = $scope.searchParams[index];
                         searchParam.editMode = true;
+                        setFocusFor('searchParam:' + searchParam.key);
 
                         $scope.$emit('advanced-searchbox:enteredEditMode', searchParam);
                     };
@@ -223,7 +224,7 @@ angular.module('angular-advanced-searchbox', [])
                             $scope.enterEditMode(undefined, $scope.searchParams.length - 1);
                         } else if ($scope.searchParams.length === 0) {
                             // no search parameter available anymore
-                            $scope.setSearchFocus = true;
+                            setFocusFor('searchbox');
                         }
                     };
 
@@ -237,7 +238,7 @@ angular.module('angular-advanced-searchbox', [])
                         if (currentIndex < $scope.searchParams.length - 1) {
                             $scope.enterEditMode(undefined, currentIndex + 1);
                         } else {
-                            $scope.setSearchFocus = true;
+                            setFocusFor('searchbox');
                         }
                     };
 
@@ -363,27 +364,30 @@ angular.module('angular-advanced-searchbox', [])
             ]
         };
     })
-    .directive('nitSetFocus', [
-        '$timeout', '$parse',
-        function($timeout, $parse) {
+    .directive('setFocusOn', [
+        function() {
             return {
                 restrict: 'A',
                 link: function($scope, $element, $attrs) {
-                    var model = $parse($attrs.nitSetFocus);
-                    $scope.$watch(model, function(value) {
-                        if (value === true) {
-                            $timeout(function() {
-                                $element[0].focus();
-                            });
+                    return $scope.$on('advanced-searchbox:setFocusOn', function(e, id) {
+                        if (id === $attrs.setFocusOn) {
+                            return $element[0].focus();
                         }
                     });
-                    /*$element.bind('blur', function() {
-                        $scope.$apply(model.assign($scope, false));
-                    });*/
                 }
             };
         }
     ])
+    .factory('setFocusFor', [
+        '$rootScope', '$timeout',
+        function($rootScope, $timeout) {
+            return function(id) {
+                return $timeout(function() {
+                    return $rootScope.$broadcast('advanced-searchbox:setFocusOn', id);
+                });
+            };
+        }
+    ])
     .directive('nitAutoSizeInput', [
         '$timeout',
         function($timeout) {