Merge pull request #15 from rdmorganiser/pending_indicator

Pending indicator
rdmorganiser · Sep 21, 2016 · ba85ccb · ba85ccb
2 parents 11e44fc + 372fad5
commit ba85ccb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/apps/core/static/core/js/core.js b/apps/core/static/core/js/core.js
@@ -135,4 +135,29 @@ angular.module('core', ['ngResource'])
             }
         }
     };
-});
+})
+
+.directive('pending', ['$http', '$timeout', function ($http, $timeout) {
+    return {
+        restrict: 'E',
+        template: '<i class="fa fa-circle-o-notch fa-spin fa-fw"></i>',
+        link: function (scope, element, attrs) {
+            scope.isPending = function () {
+                return $http.pendingRequests.length > 0;
+            };
+            scope.$watch(scope.isPending, function (value) {
+                if (value) {
+                    if (angular.isUndefined(scope.promise) || scope.pending === null) {
+                        scope.promise = $timeout(function(){
+                            element.removeClass('ng-hide');
+                        }, 300);
+                    }
+                } else {
+                    $timeout.cancel(scope.promise);
+                    scope.pending = null;
+                    element.addClass('ng-hide');
+                }
+            });
+        }
+    };
+}]);
diff --git a/apps/core/templates/core/base_navigation.html b/apps/core/templates/core/base_navigation.html
@@ -43,6 +43,12 @@
             </ul>
 
             <ul class="nav navbar-nav navbar-right">
+                <li>
+                    <p class="navbar-text">
+                        <pending></pending>
+                    </p>
+                </li>
+
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{% trans 'Language' %}<span class="caret"></span></a>
                     <ul class="dropdown-menu">

diff --git a/apps/domain/templates/domain/domain.html b/apps/domain/templates/domain/domain.html
@@ -78,7 +78,7 @@ <h2>{% trans 'Export' %}</h2>
 
     <h1>{% trans 'Domain' %}</h1>
 
-    <div ng-repeat="entity in service.domain | orderBy: 'label' | filter: service.filter" 
+    <div ng-repeat="entity in service.domain | orderBy: 'label' | filter: service.filter"
          ng-include src="'nested_entity.html'">
     </div>