Improved initialization and closing with remote fetching

indrimuska · Jun 18, 2016 · ab315ba · ab315ba
1 parent 27a464c
commit ab315ba
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-selector",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "authors": [
     "Indri Muska <indrimuska@gmail.com>"
   ],

diff --git a/dist/angular-selector.js b/dist/angular-selector.js
@@ -185,12 +185,14 @@
 					if (!angular.isDefined(scope.remoteValidation))
 						scope.remoteValidation = false;
 				if (scope.remote)
-					$q.when(!scope.hasValue() || !scope.remoteValidation
-						? angular.noop
-						: scope.fetchValidation(scope.value)
-					).then(function () {
-						scope.$watch('search', function () {
-							$timeout(scope.fetch);
+					$timeout(function () {
+						$q.when(!scope.hasValue() || !scope.remoteValidation
+							? angular.noop
+							: scope.fetchValidation(scope.value)
+						).then(function () {
+							scope.$watch('search', function () {
+								$timeout(scope.fetch);
+							});
 						});
 					});
 
@@ -273,6 +275,7 @@
 				scope.close = function () {
 					scope.isOpen = false;
 					scope.resetInput();
+					if (scope.remote) $timeout(scope.fetch);
 				};
 				scope.decrementHighlighted = function () {
 					scope.highlight(scope.highlighted - 1);
@@ -600,4 +603,4 @@
 			return new Selector($filter, $timeout, $window, $http, $q);
 		}]);
 
-})(window.angular);
+})(window.angular);
diff --git a/dist/angular-selector.min.js b/dist/angular-selector.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-selector",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "A native AngularJS directive that transform a simple `<select>` box into a full html select with typeahead.",
   "main": "src/angular-selector.js",
   "repository": {

diff --git a/src/angular-selector.js b/src/angular-selector.js
@@ -185,12 +185,14 @@
 					if (!angular.isDefined(scope.remoteValidation))
 						scope.remoteValidation = false;
 				if (scope.remote)
-					$q.when(!scope.hasValue() || !scope.remoteValidation
-						? angular.noop
-						: scope.fetchValidation(scope.value)
-					).then(function () {
-						scope.$watch('search', function () {
-							$timeout(scope.fetch);
+					$timeout(function () {
+						$q.when(!scope.hasValue() || !scope.remoteValidation
+							? angular.noop
+							: scope.fetchValidation(scope.value)
+						).then(function () {
+							scope.$watch('search', function () {
+								$timeout(scope.fetch);
+							});
 						});
 					});
 
@@ -273,6 +275,7 @@
 				scope.close = function () {
 					scope.isOpen = false;
 					scope.resetInput();
+					if (scope.remote) $timeout(scope.fetch);
 				};
 				scope.decrementHighlighted = function () {
 					scope.highlight(scope.highlighted - 1);
@@ -600,4 +603,4 @@
 			return new Selector($filter, $timeout, $window, $http, $q);
 		}]);
 
-})(window.angular);
+})(window.angular);