[Edit Mode] #627 removed edit concerns from browse controllers and markup

Fixed elements not appearing in edit mode

Fixed failing tests

platform/commonUI/browse/bundle.js

@@ -111,7 +111,6 @@ define([
                         "$scope",
                         "$route",
                         "$location",
-                        "$q",
                         "objectService",
                         "navigationService",
                         "urlService",

platform/commonUI/browse/res/templates/browse.html

@@ -72,7 +72,7 @@
 
                         <div class="split-pane-component t-inspect pane right mobile-hide">
                             <mct-representation key="'object-inspector'"
-                                                mct-object="domainObject"
+                                                mct-object="navigatedObject"
                                                 ng-model="treeModel">
                             </mct-representation>
                             <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect"

platform/commonUI/browse/res/templates/view-object.html

@@ -28,6 +28,6 @@
  representation of the object as needed.
  -->
 <mct-representation mct-object="domainObject"
-                    key="viewRegionTemplate || 'browse-object'"
+                    key="viewObjectTemplate || 'browse-object'"
                     class="abs holder holder-object">
 </mct-representation>

platform/commonUI/browse/src/BrowseController.js

@@ -49,7 +49,6 @@ define(
             $scope,
             $route,
             $location,
-            $q,
             objectService,
             navigationService,
             urlService,

platform/commonUI/browse/src/navigation/NavigationService.js

@@ -57,7 +57,7 @@ define(
         NavigationService.prototype.setNavigation = function (value) {
             var canNavigate = true;
             if (this.navigated !== value) {
-                canNavigate = (this.callbacks['before'] || [])
+                canNavigate = (this.callbacks.before || [])
                     .reduce(function (previous, callback) {
                         //Check whether the callback returned a value of
                         // 'false' indicating that navigation should not
@@ -67,7 +67,7 @@ define(
                     }, true);
                 if (canNavigate) {
                     this.navigated = value;
-                    this.callbacks['after'].forEach(function (callback) {
+                    (this.callbacks.after || []).forEach(function (callback) {
                         callback(value);
                     });
                 }

platform/commonUI/browse/test/BrowseControllerSpec.js

@@ -29,8 +29,7 @@ define(
     function (BrowseController) {
         "use strict";
 
-        //TODO: Disabled for NEM Beta
-        xdescribe("The browse controller", function () {
+        describe("The browse controller", function () {
             var mockScope,
                 mockRoute,
                 mockLocation,
@@ -214,7 +213,10 @@ define(
                 // prior to setting $route.current
                 mockLocation.path.andReturn("/browse/");
 
+                mockNavigationService.setNavigation.andReturn(true);
+
                 // Exercise the Angular workaround
+                mockNavigationService.addListener.mostRecentCall.args[0]();
                 mockScope.$on.mostRecentCall.args[1]();
                 expect(mockUnlisten).toHaveBeenCalled();
 
@@ -225,6 +227,32 @@ define(
                 );
             });
 
+            it("after successful navigation event sets the selected tree " +
+                "object", function () {
+                mockScope.navigatedObject = mockDomainObject;
+                mockNavigationService.setNavigation.andReturn(true);
+
+                //Simulate a change in selected tree object
+                mockScope.treeModel = {selectedObject: mockDomainObject};
+                mockScope.$watch.mostRecentCall.args[1](mockNextObject);
+
+                expect(mockScope.treeModel.selectedObject).toBe(mockNextObject);
+                expect(mockScope.treeModel.selectedObject).not.toBe(mockDomainObject);
+            });
+
+            it("after failed navigation event resets the selected tree" +
+                " object", function () {
+                mockScope.navigatedObject = mockDomainObject;
+                mockNavigationService.setNavigation.andReturn(false);
+
+                //Simulate a change in selected tree object
+                mockScope.treeModel = {selectedObject: mockDomainObject};
+                mockScope.$watch.mostRecentCall.args[1](mockNextObject);
+
+                expect(mockScope.treeModel.selectedObject).not.toBe(mockNextObject);
+                expect(mockScope.treeModel.selectedObject).toBe(mockDomainObject);
+            });
+
         });
     }
 );

platform/commonUI/browse/test/navigation/NavigationServiceSpec.js

@@ -84,6 +84,24 @@ define(
                 expect(callback).not.toHaveBeenCalled();
             });
 
+            it("adds listeners to the 'after' state by default", function(){
+                expect(navigationService.callbacks.after).toBeUndefined();
+                navigationService.addListener(function(){});
+                expect(navigationService.callbacks.after).toBeDefined();
+                expect(navigationService.callbacks.after.length).toBe(1);
+            });
+
+            it("allows navigationService events to be prevented", function(){
+                var callback = jasmine.createSpy("callback"),
+                    navigationResult;
+                callback.andReturn(false);
+                navigationService.addListener(callback, "before");
+                navigationResult = navigationService.setNavigation({});
+                expect(callback).toHaveBeenCalled();
+                expect(navigationResult).toBe(false);
+
+            });
+
         });
     }
-);
+);