Added extra check and onSelectcallback moved to directives.

Author: Jefiozie

src/uiSelectController.js

@@ -433,20 +433,7 @@ uis.controller('uiSelectCtrl',
         }
         _resetSearchInput();
         $scope.$broadcast('uis:select', item);
-
-        var locals = {};
-        locals[ctrl.parserResult.itemName] = item;
-
-        $timeout(function(){
-          if(!ctrl.limitReached)
-          {
-            ctrl.onSelectCallback($scope, {
-              $item: item,
-              $model: ctrl.parserResult.modelMapper($scope, locals)
-            });
-          }
-        });
-
+        
         if (ctrl.closeOnSelect) {
           ctrl.close(skipFocusser);
         }

src/uiSelectMultipleDirective.js

@@ -175,11 +175,18 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
 
       scope.$on('uis:select', function (event, item) {
         if($select.selected.length >= $select.limit) {
-          $select.limitReached = true;
           return;
         }
-        $select.limitReached = false;
         $select.selected.push(item);
+        var locals = {};        
+        locals[$select.parserResult.itemName] = item;
+
+        $timeout(function(){
+          $select.onSelectCallback(scope, {
+            $item: item,
+            $model: $select.parserResult.modelMapper(scope, locals)
+          });
+        });
         $selectMultiple.updateModel();
       });
 

src/uiSelectSingleDirective.js

@@ -51,6 +51,15 @@ uis.directive('uiSelectSingle', ['$timeout','$compile', function($timeout, $comp
 
       scope.$on('uis:select', function (event, item) {
         $select.selected = item;
+        var locals = {};        
+        locals[$select.parserResult.itemName] = item;
+
+        $timeout(function(){
+          $select.onSelectCallback(scope, {
+            $item: item,
+            $model: $select.parserResult.modelMapper(scope, locals)
+          });
+        });
       });
 
       scope.$on('uis:close', function (event, skipFocusser) {

test/select.spec.js

@@ -2792,6 +2792,23 @@ describe('ui-select tests', function() {
         expect(el.scope().$select.selected.length).toEqual(1);
     });
 
+    it('should only have 2 items selected and onSelect function should be handeld.',function(){
+        scope.onSelectFn = function ($item, $model) {
+          scope.$item = $item;
+          scope.$model = $model;
+        };
+        var el = createUiSelectMultiple({onSelect:'onSelectFn($item, $model)'});
+
+        expect(scope.$item).toBeFalsy();
+        expect(scope.$model).toBeFalsy();
+
+        clickItem(el, 'Samantha');
+        $timeout.flush();
+        clickItem(el, 'Natasha');
+        $timeout.flush();
+        expect(el.scope().$select.selected.length).toEqual(2);
+    });
+
   describe('resetSearchInput option multiple', function () {
       it('should be true by default', function () {
         expect(createUiSelectMultiple().scope().$select.resetSearchInput).toBe(true);