fix(app): correct spinner show/hide

NCI-GDC · Mar 31, 2016 · fdce007 · fdce007
1 parent 5efd889
commit fdce007
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/scripts/query/query.controllers.ts b/app/scripts/query/query.controllers.ts
@@ -80,9 +80,6 @@ module ngApp.query.controllers {
     }
 
     refresh() {
-      this.participantsLoading = true;
-      this.filesLoading = true;
-
       if (this.tabSwitch) {
         if (this.QState.tabs.participants.active) {
           this.QState.setActive("participants", "hasLoadedOnce");
@@ -95,6 +92,9 @@ module ngApp.query.controllers {
         return;
       }
 
+      this.participantsLoading = true;
+      this.filesLoading = true;
+
       this.SearchService.getSummary().then((data) => {
         this.summary = data;
       });

diff --git a/app/scripts/query/templates/query.html b/app/scripts/query/templates/query.html
@@ -8,7 +8,7 @@ <h3 class="col-lg-9 col-md-8" data-ng-if="qc.participantsLoading && qc.filesLoad
         Loading, please wait.. <i class="fa fa-spinner fa-spin"></i>
       </h3>
 
-      <h3 class="col-lg-9 col-md-8" data-ng-if="!qc.participants.hits.length && !qc.files.hits.length && qc.participantsLoading && qc.filesLoading" data-translate>
+      <h3 class="col-lg-9 col-md-8" data-ng-if="!qc.participants.hits.length && !qc.files.hits.length && !qc.participantsLoading && !qc.filesLoading" data-translate>
         No results found using those filters.
       </h3>
 

diff --git a/app/scripts/search/search.controllers.ts b/app/scripts/search/search.controllers.ts
@@ -105,9 +105,6 @@ module ngApp.search.controllers {
     }
 
     refresh() {
-      this.filesLoading = true;
-      this.participantsLoading = true;
-
       if (this.tabSwitch) {
         if (this.SearchState.tabs.participants.active) {
           this.SearchState.setActive("tabs", "participants", "hasLoadedOnce");
@@ -120,6 +117,9 @@ module ngApp.search.controllers {
         return;
       }
 
+      this.filesLoading = true;
+      this.participantsLoading = true;
+
       this.SearchService.getSummary().then((data) => {
         this.summary = data;
         this.tabSwitch = false;