From 158b443e6cd38693c4236617ca3e5bb29ea19464 Mon Sep 17 00:00:00 2001 From: Nitin Sangal Date: Wed, 10 Sep 2014 18:29:05 +0530 Subject: [PATCH 1/6] Solved issue with angular ui typehead --- dist/angular-block-ui.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dist/angular-block-ui.js b/dist/angular-block-ui.js index 0cf23fa..531007b 100755 --- a/dist/angular-block-ui.js +++ b/dist/angular-block-ui.js @@ -378,6 +378,13 @@ blkUI.factory('blockUI', ["blockUIConfig", "$timeout", "blockUIUtils", "$documen self._restoreFocus.focus(); self._restoreFocus = null; } + else { + if(typeof(self._restoreFocus) != "undefined") + { + self._restoreFocus.focus(); + self._restoreFocus = null; + } + } try { if (executeCallbacks) { @@ -558,4 +565,4 @@ angular.module('blockUI').run(['$templateCache', function($templateCache){ $templateCache.put('angular-block-ui/angular-block-ui.ng.html', '
{{ state.message }}
'); }]); })(angular); -//# sourceMappingURL=angular-block-ui.js.map \ No newline at end of file +//# sourceMappingURL=angular-block-ui.js.map From 30d57892fcce1c32b0a542d1a4dbec242f973d7f Mon Sep 17 00:00:00 2001 From: Nitin Sangal Date: Wed, 10 Sep 2014 18:37:17 +0530 Subject: [PATCH 2/6] Change name in bower json --- bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 5802585..d4bbd30 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { - "name": "angular-block-ui", - "description": "An AngularJS module that allows you to block user interaction on AJAX requests.", + "name": "angular-block-ui-typeahead", + "description": "An AngularJS module that allows you to block user interaction on AJAX requests.It can be used with angular ui bootstrap typeahead.", "version": "0.1.0-beta.1", "keywords": [ "angular", From 8dd2258378c97a79e2889165bcef38cbef974811 Mon Sep 17 00:00:00 2001 From: Nitin Sangal Date: Wed, 10 Sep 2014 18:47:32 +0530 Subject: [PATCH 3/6] revert changes --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index d4bbd30..ff99f71 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "angular-block-ui-typeahead", + "name": "angular-block-ui", "description": "An AngularJS module that allows you to block user interaction on AJAX requests.It can be used with angular ui bootstrap typeahead.", "version": "0.1.0-beta.1", "keywords": [ From a55523c069f05b76edc19f696f51f4a50c4a27f1 Mon Sep 17 00:00:00 2001 From: Nitin Sangal Date: Wed, 10 Sep 2014 19:15:45 +0530 Subject: [PATCH 4/6] revert changes --- dist/angular-block-ui.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dist/angular-block-ui.js b/dist/angular-block-ui.js index 531007b..71ff6c6 100755 --- a/dist/angular-block-ui.js +++ b/dist/angular-block-ui.js @@ -378,13 +378,7 @@ blkUI.factory('blockUI', ["blockUIConfig", "$timeout", "blockUIUtils", "$documen self._restoreFocus.focus(); self._restoreFocus = null; } - else { - if(typeof(self._restoreFocus) != "undefined") - { - self._restoreFocus.focus(); - self._restoreFocus = null; - } - } + try { if (executeCallbacks) { From 0366332c86277000e55a76e007904953e99426f5 Mon Sep 17 00:00:00 2001 From: Nitin Sangal Date: Wed, 10 Sep 2014 19:16:54 +0530 Subject: [PATCH 5/6] to work with typeahead bootstrap --- src/angular-block-ui/service.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/angular-block-ui/service.js b/src/angular-block-ui/service.js index e24ec40..b6504e5 100644 --- a/src/angular-block-ui/service.js +++ b/src/angular-block-ui/service.js @@ -100,6 +100,13 @@ blkUI.factory('blockUI', function(blockUIConfig, $timeout, blockUIUtils, $docume self._restoreFocus.focus(); self._restoreFocus = null; } + else { + if(typeof(self._restoreFocus) != "undefined") + { + self._restoreFocus.focus(); + self._restoreFocus = null; + } + } try { if (executeCallbacks) { From a91eb125f94e781901c505702f3d2e1e2d314c88 Mon Sep 17 00:00:00 2001 From: Nitin Date: Thu, 11 Sep 2014 16:05:10 +0530 Subject: [PATCH 6/6] changes for angularjs typeahead --- dist/angular-block-ui.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dist/angular-block-ui.js b/dist/angular-block-ui.js index 71ff6c6..d466123 100755 --- a/dist/angular-block-ui.js +++ b/dist/angular-block-ui.js @@ -378,6 +378,14 @@ blkUI.factory('blockUI', ["blockUIConfig", "$timeout", "blockUIUtils", "$documen self._restoreFocus.focus(); self._restoreFocus = null; } + + else { + if(typeof(self._restoreFocus) != "undefined") + { + self._restoreFocus.focus(); + self._restoreFocus = null; + } + } try {