[Mobile] Collapse tree on click

Collapse tree any time a user does an action in the
tree that would select an object; don't only do this
on navigation changes, because this fails to detect
occasions where user clicks the already-navigated-to
object.

platform/commonUI/general/res/templates/subtree.html

@@ -29,6 +29,7 @@
     <li ng-repeat="child in composition">
         <mct-representation key="'tree-node'"
                             mct-object="child"
+                            parameters="parameters"
                             ng-model="ngModel">
         </mct-representation>
     </li>

platform/commonUI/general/res/templates/tree-node.html

@@ -39,7 +39,7 @@
                 class="mobile-hide"
                 key="'label'"
                 mct-object="domainObject"
-                ng-click="ngModel.selectedObject = domainObject"
+                ng-click="treeNode.select()"
                 >
             </mct-representation>
             <mct-representation
@@ -47,12 +47,9 @@
                 class="desktop-hide"
                 key="'label'"
                 mct-object="domainObject"
-                ng-click="ngModel.selectedObject =
-                              model.composition === undefined ?
-                                  domainObject : ngModel.selectedObject;
+                ng-click="(model.composition === undefined) && treeNode.select();
                           toggle.toggle();
-                          treeNode.trackExpansion();
-                          "
+                          treeNode.trackExpansion();"
                 >
             </mct-representation>
 
@@ -60,7 +57,7 @@
                 mct-device="mobile"
                 class='ui-symbol view-control'
                 ng-model="ngModel"
-                ng-click="ngModel.selectedObject = domainObject"
+                ng-click="treeNode.select()"
                 >
                 }
             </span>
@@ -73,6 +70,7 @@
 
             <mct-representation key="'subtree'"
                                 ng-model="ngModel"
+                                parameters="parameters"
                                 mct-object="treeNode.hasBeenExpanded() && domainObject">
             </mct-representation>
 

platform/commonUI/general/res/templates/tree.html

@@ -23,7 +23,8 @@
     <li>
         <mct-representation key="'tree-node'"
                             mct-object="domainObject"
-                            ng-model="ngModel">
+                            ng-model="ngModel"
+                            parameters="parameters">
         </mct-representation>
     </li>
 </ul>

platform/commonUI/general/src/controllers/TreeNodeController.js

@@ -48,6 +48,15 @@ define(
          * node expansion when this tree node's _subtree_ will contain
          * the navigated object (recursively, this becomes an
          * expand-to-show-navigated-object behavior.)
+         *
+         * Finally, if a `callback` property is passed in through the
+         * `parameters` attribute of the `tree-node`, that callback
+         * will be invoked whenever a user clicks in a manner which
+         * would result in a selection. This callback is invoked
+         * even if the selection does not change (if you are only
+         * interested in changes, watch the `selectedObject` property
+         * of the object passed in `ng-model` instead.)
+         *
          * @memberof platform/commonUI/general
          * @constructor
          */
@@ -140,6 +149,22 @@ define(
             $scope.$watch("domainObject", checkSelection);
         }
 
+        /**
+         * Select the domain object represented by this node in the tree.
+         * This will both update the `selectedObject` property in
+         * the object passed in via `ng-model`, and will fire any `callback`
+         * passed in via `parameters`.
+         */
+        TreeNodeController.prototype.select = function () {
+            if (this.$scope.ngModel) {
+                this.$scope.ngModel.selectedObject =
+                    this.$scope.domainObject;
+            }
+            if ((this.$scope.parameters || {}).callback) {
+                this.$scope.parameters.callback(this.$scope.domainObject);
+            }
+        };
+
         /**
          * This method should be called when a node is expanded
          * to record that this has occurred, to support one-time

platform/commonUI/general/test/controllers/TreeNodeControllerSpec.js

@@ -47,7 +47,6 @@ define(
                 mockScope = jasmine.createSpyObj("$scope", ["$watch", "$on", "$emit"]);
                 mockTimeout = jasmine.createSpy("$timeout");
                 mockAgentService = jasmine.createSpyObj("agentService", ["isMobile", "isPhone", "getOrientation"]);
-                mockNgModel = jasmine.createSpyObj("ngModel", ["selectedObject"]);
                 mockDomainObject = jasmine.createSpyObj(
                     "domainObject",
                     [ "getId", "getCapability", "getModel", "useCapability" ]
@@ -196,6 +195,22 @@ define(
                 expect(controller.isSelected()).toBeFalsy();
 
             });
+
+            it("exposes selected objects in scope", function () {
+                mockScope.domainObject = mockDomainObject;
+                mockScope.ngModel = {};
+                controller.select();
+                expect(mockScope.ngModel.selectedObject)
+                    .toEqual(mockDomainObject);
+            });
+
+            it("invokes optional callbacks upon selection", function () {
+                mockScope.parameters =
+                    { callback: jasmine.createSpy('callback') };
+                controller.select();
+                expect(mockScope.parameters.callback).toHaveBeenCalled();
+            });
+
         });
     }
 );