[kbnLoading] Made the directive so we dont have to repeat, with some

cleanup
elastic · Mar 14, 2016 · 40f91ba · 40f91ba
1 parent f3653a1
commit 40f91ba
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html
@@ -52,7 +52,6 @@
         ng-click="configTemplate.toggle('options');">
         <span>Options</span>
       </button>
-      <kbn-loading-indicator></kbn-loading-indicator>
       <kbn-global-timepicker></kbn-global-timepicker>
     </div>
   </navbar>

diff --git a/src/plugins/kibana/public/discover/index.html b/src/plugins/kibana/public/discover/index.html
@@ -39,7 +39,6 @@
         ng-click="configTemplate.toggle('share');">
         <span>Share</span>
       </button>
-      <kbn-loading-indicator></kbn-loading-indicator>
       <kbn-global-timepicker></kbn-global-timepicker>
     </div>
   </navbar>

diff --git a/src/plugins/kibana/public/visualize/editor/editor.html b/src/plugins/kibana/public/visualize/editor/editor.html
@@ -45,7 +45,6 @@
         aria-label="Refresh">
         <span>Refresh</span>
       </button>
-      <kbn-loading-indicator></kbn-loading-indicator>
       <kbn-global-timepicker></kbn-global-timepicker>
     </div>
   </navbar>

diff --git a/src/ui/public/chrome/chrome.html b/src/ui/public/chrome/chrome.html
@@ -81,7 +81,7 @@
         </div>
         <!-- /Full navbar -->
       </nav>
-      <div class="application" ng-class="'tab-' + chrome.getActiveTabId('-none-') + ' ' + chrome.getApplicationClasses()" ng-view></div>
+      <div class="application" ng-class="'tab-' + chrome.getActiveTabId('-none-') + ' ' + chrome.getApplicationClasses()" ng-view kbn-loading-indicator></div>
     </div>
   </div>
 </div>
diff --git a/src/ui/public/chrome/directives/active_http_spinner.html b/src/ui/public/chrome/directives/active_http_spinner.html
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js
@@ -13,7 +13,7 @@ export default function (chrome, internals) {
         const parts = [$element.html()];
         const controls = Private(chromeNavControlsRegistry);
 
-        for (const control of [...controls.inOrder]) {
+        for (const control of controls.inOrder) {
           parts.unshift(
             `<!-- nav control ${control.name} -->`,
             control.template

diff --git a/src/ui/public/chrome/directives/kbn_loading_indicator.js b/src/ui/public/chrome/directives/kbn_loading_indicator.js
@@ -4,9 +4,13 @@ const spinnerTemplate = '<div class="spinner" ng-show="chrome.httpActive.length"
 
 UiModules
 .get('ui/kibana')
-.directive('kbnLoadingIndicator', function() {
+.directive('kbnLoadingIndicator', function($rootScope, $compile) {
   return {
-    restrict: 'E',
-    template: spinnerTemplate
+    restrict: 'AC',
+    link: function(scope, $el) {
+      const $loadingEl = angular.element(spinnerTemplate);
+      $el.append($loadingEl);
+      $compile($loadingEl)(scope);
+    }
   }
 });
diff --git a/src/ui/public/styles/spinner.less b/src/ui/public/styles/spinner.less
@@ -17,6 +17,7 @@
   right: 0;
   height: 2px;
   position: absolute;
+  z-index: 10;
   visibility: visible;
   display: block;
   animation: move 2s linear infinite;