Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7732 Loader icon keeps spinning and is chopped in half 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1688156 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Upayavira 2015-06-29 08:54:27 +00:00
parent 8c964253b5
commit 5d8668700f
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/webapp/web/css/angular/common.css
View File

@ -182,8 +182,10 @@ ul
.universal-loader { .universal-loader {
position: absolute; position: absolute;
left: 0px; left: -16px;
top: 0px; top: 0px;
width: 16px;
height: 16px;
} }
#wrapper #wrapper

9
solr/webapp/web/js/angular/app.js vendored
View File

@ -253,7 +253,6 @@ solrAdminApp.config([
var activeRequests = 0; var activeRequests = 0;
var started = function(config) { var started = function(config) {
console.log("start HTTP for " + config.url);
if (activeRequests == 0) { if (activeRequests == 0) {
$rootScope.$broadcast('loadingStatusActive'); $rootScope.$broadcast('loadingStatusActive');
} }
@ -267,7 +266,6 @@ solrAdminApp.config([
if (activeRequests == 0) { if (activeRequests == 0) {
$rootScope.$broadcast('loadingStatusInactive'); $rootScope.$broadcast('loadingStatusInactive');
} }
console.log("ended");
if ($rootScope.retryCount>0) { if ($rootScope.retryCount>0) {
$rootScope.connectionRecovered = true; $rootScope.connectionRecovered = true;
$rootScope.retryCount=0; $rootScope.retryCount=0;
@ -280,14 +278,13 @@ solrAdminApp.config([
}; };
var failed = function(rejection) { var failed = function(rejection) {
if (rejection.config.params.doNotIntercept) {
return rejection;
}
activeRequests--; activeRequests--;
if (activeRequests == 0) { if (activeRequests == 0) {
$rootScope.$broadcast('loadingStatusInactive'); $rootScope.$broadcast('loadingStatusInactive');
} }
console.log("ERROR " + rejection.status + ": " + rejection.config.url); if (rejection.config.params.doNotIntercept) {
return rejection;
}
if (rejection.status === 0) { if (rejection.status === 0) {
$rootScope.$broadcast('connectionStatusActive'); $rootScope.$broadcast('connectionStatusActive');
if (!$rootScope.retryCount) $rootScope.retryCount=0; if (!$rootScope.retryCount) $rootScope.retryCount=0;