[chrome] replace the active http requests spinner

elastic · Feb 11, 2016 · 1bf3106 · 1bf3106
1 parent 4e27267
commit 1bf3106
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/ui/public/chrome/directives/active_http_spinner.html b/src/ui/public/chrome/directives/active_http_spinner.html
@@ -0,0 +1,5 @@
+<ul class="nav navbar-nav navbar-right navbar-timepicker" >
+  <li ng-show="chrome.httpActive.length" class="navbar-text hidden-xs">
+    <div class="spinner"></div>
+  </li>
+</ul>
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js
@@ -2,6 +2,12 @@ import $ from 'jquery';
 
 import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
 import UiModules from 'ui/modules';
+import spinnerHtml from './active_http_spinner.html';
+
+const spinner = {
+  name: 'active http requests',
+  template: spinnerHtml
+};
 
 export default function (chrome, internals) {
 
@@ -13,7 +19,7 @@ export default function (chrome, internals) {
         const parts = [$element.html()];
         const controls = Private(chromeNavControlsRegistry);
 
-        for (const control of controls.inOrder) {
+        for (const control of [spinner, ...controls.inOrder]) {
           parts.unshift(
             `<!-- nav control ${control.name} -->`,
             control.template

diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js
@@ -44,7 +44,7 @@ export default function (chrome, internals) {
         onRouteChange();
 
         // and some local values
-        $scope.httpActive = $http.pendingRequests;
+        chrome.httpActive = $http.pendingRequests;
         $scope.notifList = require('ui/notify')._notifs;
         $scope.appSwitcherTemplate = new ConfigTemplate({
           switcher: '<app-switcher></app-switcher>'