Fix #588

hawtio · Sep 27, 2013 · 525b1a7 · 525b1a7
1 parent eb092f3
commit 525b1a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/js/navbar.ts b/hawtio-web/src/main/webapp/app/core/js/navbar.ts
@@ -30,6 +30,12 @@ module Core {
           $location.search(Perspective.perspectiveSearchId, perspective.id);
           reloadPerspective();
           $scope.topLevelTabs = Perspective.topLevelTabs($location, workspace, jolokia, localStorage);
+          if (oldValue) {
+            oldValue.lastPage = $location.url();
+            if (newValue.lastPage) {
+              $location.url(Core.trimLeading(newValue.lastPage, "#"));
+            }
+          }
         }
       }
     });

diff --git a/hawtio-web/src/main/webapp/app/perspective/js/perspectivePlugin.ts b/hawtio-web/src/main/webapp/app/perspective/js/perspectivePlugin.ts
@@ -6,23 +6,10 @@ module Perspective {
                     when('/perspective/defaultPage', {templateUrl: 'app/perspective/html/defaultPage.html',
                       controller: Perspective.DefaultPageController});
           }).
-          run(($location:ng.ILocationService, workspace:Workspace, viewRegistry, layoutFull, $rootScope, jolokia, localStorage) => {
+          run(($location:ng.ILocationService, workspace:Workspace, viewRegistry, layoutFull) => {
 
             viewRegistry['perspective'] = layoutFull;
 
-            $rootScope.$on('$locationChangeStart', (event, newRoute, oldRoute) => {
-
-              var perspectives = Perspective.getPerspectives($location, workspace, jolokia, localStorage);
-              var currentId = Perspective.currentPerspectiveId($location, workspace, jolokia, localStorage);
-
-              var perspective = perspectives.find({id: currentId});
-
-              if (perspective) {
-                Core.pathSet(perspective, ['lastPage'], Core.extractHashURL(oldRoute));
-              }
-            });
-
-
           });
 
   hawtioPluginLoader.addModule(pluginName);