From 83ed4f6b0d0a1bdde2aa77af014646f6b0463731 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 9 Dec 2016 09:59:27 -0800 Subject: [PATCH] [Navigation] Fix errors appearing in console on initial navigation. Fixes #1351 --- platform/commonUI/browse/src/BrowseController.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/browse/src/BrowseController.js b/platform/commonUI/browse/src/BrowseController.js index c1cbbc022c..785a950891 100644 --- a/platform/commonUI/browse/src/BrowseController.js +++ b/platform/commonUI/browse/src/BrowseController.js @@ -52,7 +52,7 @@ define( var currentIds = $route.current.params.ids; $scope.treeModel = { - selectedObject: {} + selectedObject: undefined }; function idsForObject(domainObject) { @@ -139,7 +139,11 @@ define( // Also listen for changes which come from the tree. Changes in // the tree will trigger a change in browse navigation state. - $scope.$watch("treeModel.selectedObject", navigateDirectlyToModel); + $scope.$watch("treeModel.selectedObject", function (newObject, oldObject) { + if (oldObject !== newObject) { + navigateDirectlyToModel(newObject); + } + }); // Listen for route changes which are caused by browser events