preserve routing when using http fallback

tariqbuilds · May 13, 2017 · 8ab6733 · 8ab6733
1 parent c8cc31a
commit 8ab6733
Show file tree

Hide file tree

Showing 4 changed files with 2,337 additions and 14 deletions.
diff --git a/app/linuxDash.min.js b/app/linuxDash.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -27,7 +27,7 @@ g.task('generate-js-dist', ['template-cache'], function () {
   ])
   .pipe(concat('linuxDash.min.js'))
   .pipe(ngAnnotate())
-  .pipe(uglify())
+  // .pipe(uglify())
   .on('error', gutil.log)
   .pipe(g.dest('app/'))
 })

diff --git a/src/js/core/app.js b/src/js/core/app.js
@@ -1,10 +1,12 @@
 function runFn(server, $location, $rootScope) {
-
   server.checkIfWebsocketsAreSupported()
 
-  var currentRoute = $location.path()
-  var currentTab = (currentRoute === '/loading')? 'system-status': currentRoute
-  localStorage.setItem('currentTab', currentTab)
+  $rootScope.$on("$locationChangeSuccess", function(event, next, current) {
+    var nextRoute = next.split('#')[1]
+    if (nextRoute !== '/loading') {
+      localStorage.setItem('currentTab', nextRoute)
+    }
+  });
 
   $location.path('/loading')
 }

diff --git a/src/js/core/server.service.js b/src/js/core/server.service.js
@@ -88,9 +88,7 @@ angular
               establishWebsocketConnection();
 
             } else {
-              // rootScope event not propogating from here.
-              // instead, we manually route to url
-              $location.path('/system-status');
+              $rootScope.$broadcast("start-linux-dash", {});
             }
 
           });