maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1 from rashidkpc/pr/6645

Browse source 
Move kbn-loading-indicator to element
This commit is contained in:
Khalah Jones Golden 2016-03-24 16:22:56 -04:00
parent 2202f7fb92 e60aca3b61
commit 6b47cedd3b
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ui/public/chrome/__tests__/kbn_loading_indicator.js
View file

@ -16,7 +16,7 @@ describe('kbnLoadingIndicator', function () {
$rootScope.chrome = { $rootScope.chrome = {
httpActive: (hasActiveConnections ? [1] : []) httpActive: (hasActiveConnections ? [1] : [])
}; };
const $el = $('<div kbn-loading-indicator><div id="other-content"></div></div>'); const $el = $('<kbn-loading-indicator></kbn-loading-indicator>');
$rootScope.$apply(); $rootScope.$apply();
$compile($el)($rootScope); $compile($el)($rootScope);
return $el; return $el;
@ -38,10 +38,4 @@ describe('kbnLoadingIndicator', function () {
const $el = compile(true); const $el = compile(true);
expect($el.find('.spinner.ng-hide')).to.have.length(0); expect($el.find('.spinner.ng-hide')).to.have.length(0);
}); });
it('doesn\'t modify the contents of what the elment already has', function () {
const $el = compile();
expect($el.find('#other-content')).to.have.length(1);
});
}); });

3
src/ui/public/chrome/chrome.html
View file

@ -64,7 +64,8 @@
</div> </div>
<!-- /Full navbar --> <!-- /Full navbar -->
</nav> </nav>
<div class="application" ng-class="'tab-' + chrome.getFirstPathSegment() + ' ' + chrome.getApplicationClasses()" ng-view kbn-loading-indicator></div> <kbn-loading-indicator></kbn-loading-indicator>
<div class="application" ng-class="'tab-' + chrome.getFirstPathSegment() + ' ' + chrome.getApplicationClasses()" ng-view></div>
</div> </div>
</div> </div>
</div> </div>

8
src/ui/public/chrome/directives/kbn_loading_indicator.js
View file

@ -7,11 +7,7 @@ UiModules
.get('ui/kibana') .get('ui/kibana')
.directive('kbnLoadingIndicator', function ($compile) { .directive('kbnLoadingIndicator', function ($compile) {
return { return {
restrict: 'AC', restrict: 'E',
link: function (scope, $el) { template: spinnerTemplate,
const $loadingEl = angular.element(spinnerTemplate);
$el.append($loadingEl);
$compile($loadingEl)(scope);
}
}; };
}); });