Skip to content

Commit 3ec5e4d

Browse files
committed
Merge branch 'iozag-IsBlocking'
2 parents 7414db9 + 49eea1e commit 3ec5e4d

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

.idea/runConfigurations/watch_sh.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ Allows the message shown in the overlay to be updated while to block is active.
9696
#### done
9797
Queues a callback function to be called when the block has finished. This can be useful whenever you wish to redirect the user to a different location while there are still pending AJAX requests.
9898

99+
#### isBlocking
100+
Returns whether currently a block is shown for the instance or not.
101+
99102
**Arguments:**
100103

101104
* **callback** (function)

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = function(config) {
4949

5050

5151
// enable / disable watching file and executing tests whenever any file changes
52-
autoWatch: false,
52+
autoWatch: true,
5353

5454

5555
// start these browsers

src/angular-block-ui/service.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ blkUI.factory('blockUI', function(blockUIConfig, $timeout, blockUIUtils, $docume
7575
}
7676
};
7777

78+
this.isBlocking = function () {
79+
return state.blocking;
80+
};
81+
7882
this.message = function(value) {
7983
state.message = value;
8084
};

0 commit comments

Comments
 (0)