Merge branch 'refs/heads/develop'

Author: Null McNull

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-block-ui",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "keywords": [
     "angular",
     "angularjs",

build-package.sh

@@ -12,4 +12,4 @@ cp LICENSE package/angular-block-ui/
 cp README.md package/angular-block-ui/
 cp bower.json package/angular-block-ui/
 
-git subtree split --prefix package/angular-block-ui --branch bower
+# git subtree split --prefix package/angular-block-ui --branch bower

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-block-ui",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "An elegant but advanced AngularJS module that allows you to block user interaction on AJAX requests. Blocking is done automatically for each http request and/or manually via an injectable service.",
   "main": "grunt",
   "scripts": {

package/angular-block-ui/angular-block-ui.css

@@ -23,7 +23,7 @@ body > .block-ui > .block-ui-overlay {
 
 .block-ui-message-container {
   position: absolute;
-  top: 40%;
+  top: 35%;
   left: 0;
   right: 0;
   height: 0;

package/angular-block-ui/angular-block-ui.js

@@ -118,7 +118,17 @@ angular.module('blockUI').directive('blockUi', function(blockUI, blockUIConfig,
         var instanceId = !$attrs.blockUi ? $scope.$id : $attrs.blockUi;
 
         srvInstance = blockUI.instances.get(instanceId);
-        srvInstance.addRef();
+
+        // Locate the parent blockUI instance
+
+        var parentInstance = $element.inheritedData('block-ui');
+
+        if(parentInstance) {
+
+          // TODO: assert if parent is already set to something else
+          
+          srvInstance._parent = parentInstance;
+        }
 
         // If a pattern is provided assign it to the state
 
@@ -134,10 +144,14 @@ angular.module('blockUI').directive('blockUi', function(blockUI, blockUIConfig,
         $scope.$on('$destroy', function() {
           srvInstance.release();
         });
+
+        // Increase the reference count
+
+        srvInstance.addRef();
       }
 
       $element.addClass('block-ui');
-      $element.data('block-ui', srvInstance);
+      $parent.data('block-ui', srvInstance);
       $scope.state = srvInstance.state();
     }
   };
@@ -202,7 +216,9 @@ angular.module('blockUI').factory('blockUIHttpInterceptor', function($q, $inject
 
 });
 
-angular.module('blockUI').factory('blockUI', function(blockUIConfig, $timeout, blockUIUtils) {
+angular.module('blockUI').factory('blockUI', function(blockUIConfig, $timeout, blockUIUtils, $document) {
+
+  var $body = $document.find('body');
 
   function BlockUI(id) {
 
@@ -222,6 +238,19 @@ angular.module('blockUI').factory('blockUI', function(blockUIConfig, $timeout, b
 
       state.blockCount++;
 
+      // Check if the focused element is part of the block scope
+
+      var $ae = angular.element($document[0].activeElement);
+
+      if($ae.length && blockUIUtils.isElementInBlockScope($ae, self)) {
+
+        // Let the active element lose focus and store a reference 
+        // to restore focus when we're done (reset)
+
+        self._restoreFocus = $ae[0];
+        self._restoreFocus.blur();
+      }
+
       if (!startPromise) {
         startPromise = $timeout(function() {
           startPromise = null;
@@ -258,10 +287,21 @@ angular.module('blockUI').factory('blockUI', function(blockUIConfig, $timeout, b
     };
 
     this.reset = function(executeCallbacks) {
+      
       self._cancelStartTimeout();
       state.blockCount = 0;
       state.blocking = false;
 
+      // Restore the focus to the element that was active
+      // before the block start, but not if the user has 
+      // focused something else while the block was active.
+
+      if(self._restoreFocus && 
+         (!$document[0].activeElement || $document[0].activeElement === $body[0])) {
+        self._restoreFocus.focus();
+        self._restoreFocus = null;
+      }
+      
       try {
         if (executeCallbacks) {
           angular.forEach(doneCallbacks, function(cb) {
@@ -389,6 +429,19 @@ angular.module('blockUI').factory('blockUIUtils', function() {
       arr[fnName] = function() {
         utils.forEachFn(this, fnName, arguments);
       }
+    },
+    isElementInBlockScope: function($element, blockScope) {
+      var c = $element.inheritedData('block-ui');
+
+      while(c) {
+        if(c === blockScope) {
+          return true;
+        }
+
+        c = c._parent;
+      }
+
+      return false;
     }
   };
 

package/angular-block-ui/angular-block-ui.min.css

@@ -1,6 +1,6 @@
 {
   "name": "angular-block-ui",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "keywords": [
     "angular",
     "angularjs",

package/angular-block-ui/angular-block-ui.min.js

@@ -1,5 +1,7 @@
 [
   {
+    "0": "O",
+    "1": "K",
     "id": 1,
     "author": "Audrey Hepburn",
     "text": "Nothing is impossible, the word itself says 'I'm possible'!"

package/angular-block-ui/bower.json

@@ -23,7 +23,7 @@ body > .block-ui > .block-ui-overlay {
 
 .block-ui-message-container {
   position: absolute;
-  top: 40%;
+  top: 35%;
   left: 0;
   right: 0;
   height: 0;