fix(core): fix lag in spinner, loading page title

spinnaker · May 12, 2017 · 8f1de45 · 8f1de45
1 parent eadcb81
commit 8f1de45
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/app/index.deck b/app/index.deck
@@ -1,7 +1,7 @@
 <!doctype html>
 <html class="no-js" ng-app="netflix.spinnaker">
 <head>
-  <title ng-bind="pageTitle">Spinnaker</title>
+  <title>Spinnaker</title>
   <meta charset="utf-8">
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width">

diff --git a/app/scripts/modules/core/pageTitle/pageTitle.service.spec.js b/app/scripts/modules/core/pageTitle/pageTitle.service.spec.js
@@ -18,7 +18,7 @@ describe('Service: pageTitleService', function() {
       var scope = this.$rootScope;
 
       expect(scope.routing).toBeFalsy();
-      expect(document.title).toBe('');
+      document.title = 'Spinnaker!';
 
       this.pageTitleService.handleRoutingStart();
       expect(scope.routing).toBeTruthy();

diff --git a/app/scripts/modules/core/pageTitle/pageTitle.service.ts b/app/scripts/modules/core/pageTitle/pageTitle.service.ts
@@ -30,13 +30,12 @@ interface IPageDataParts {
 }
 
 export class PageTitleService {
-  public static $inject = [ '$rootScope', '$stateParams', '$transitions' ];
-
   private previousPageTitle = 'Spinnaker';
+  private routeCount = 0;
 
   constructor(private $rootScope: IScope, private $stateParams: StateParams, $transitions: TransitionService) {
-    $rootScope.routing = 0;
-
+    'ngInject';
+    document.title = 'Spinnaker: Loading...';
     $transitions.onStart({}, transition => {
       this.handleRoutingStart();
       const onSuccess = () => this.handleRoutingSuccess(transition.to().data);
@@ -46,13 +45,15 @@ export class PageTitleService {
   }
 
   public handleRoutingStart(): void {
-    this.$rootScope.routing++;
+    this.routeCount++;
     this.previousPageTitle = document.title;
+    this.setRoutingFlag();
     document.title = 'Spinnaker: Loading...';
   }
 
   public handleRoutingError(rejection: Rejection): void {
-    this.$rootScope.routing--;
+    this.routeCount--;
+    this.setRoutingFlag();
     const cancelled = rejection.type === RejectType.ABORTED;
     document.title = cancelled ? this.previousPageTitle : 'Spinnaker: Error';
   }
@@ -127,6 +128,10 @@ export class PageTitleService {
       details: this.configureDetails(data.pageTitleDetails)
     };
   }
+
+  private setRoutingFlag() {
+    this.$rootScope.routing = this.routeCount > 0;
+  }
 }
 
 export const CORE_PAGETITLE_SERVICE = 'spinnaker.core.pageTitle.service';