From 4e7e5bb7839b6edd769e4f694b8cc109a86d8e1a Mon Sep 17 00:00:00 2001
From: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue, 4 Jul 2017 15:34:37 -0700
Subject: [PATCH] [Time] Conductor changes based on click not scope

Update time conductor so that it triggers changes when the user
selects them instead of when the scope is updated.  Prevents spurious
changes from being triggered by the conductor when it updates
in response to a time API change.

Fixes #1636.
---
 .../templates/mode-selector/mode-menu.html    |  2 +-
 .../core/src/ui/TimeConductorController.js    | 43 ++++++++++---------
 .../runs/TimeSettingsURLHandlerSpec.js        |  8 +++-
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/platform/features/conductor/core/res/templates/mode-selector/mode-menu.html b/platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
index 32c026de9d..b0689ea4c9 100644
--- a/platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
+++ b/platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
@@ -23,7 +23,7 @@
     <div class="pane left menu-items">
         <ul>
             <li ng-repeat="metadata in ngModel.options"
-                ng-click="ngModel.selected = metadata">
+                ng-click="ngModel.select(metadata)">
                 <a ng-mouseover="ngModel.activeMetadata = metadata"
                    ng-mouseleave="ngModel.activeMetadata = undefined"
                    class="menu-item-a {{metadata.cssClass}}">
diff --git a/platform/features/conductor/core/src/ui/TimeConductorController.js b/platform/features/conductor/core/src/ui/TimeConductorController.js
index 0a7ce7fff2..76ea01efb6 100644
--- a/platform/features/conductor/core/src/ui/TimeConductorController.js
+++ b/platform/features/conductor/core/src/ui/TimeConductorController.js
@@ -111,7 +111,8 @@ define(
             var options = this.optionsFromConfig(config);
             this.menu = {
                 selected: undefined,
-                options: options
+                options: options,
+                select: this.selectMenuOption
             };
 
             //Set the initial state of the UI from the conductor state
@@ -132,8 +133,6 @@ define(
                 this.setViewFromBounds(bounds);
             }
 
-            this.$scope.$watch("tcController.menu.selected", this.selectMenuOption);
-
             this.conductorViewService.on('pan', this.onPan);
             this.conductorViewService.on('pan-stop', this.onPanStop);
 
@@ -164,26 +163,28 @@ define(
          *
          * @private
          * @param newOption
-         * @param oldOption
          */
-        TimeConductorController.prototype.selectMenuOption = function (newOption, oldOption) {
-            if (newOption !== oldOption) {
-                var config = this.getConfig(this.timeAPI.timeSystem(), newOption.clock);
-                if (!config) {
-                    // Clock does not support this timeSystem, fallback to first
-                    // option provided for clock.
-                    config = this.config.menuOptions.filter(function (menuOption) {
-                        return menuOption.clock === (newOption.clock && newOption.clock.key);
-                    })[0];
-                }
+        TimeConductorController.prototype.selectMenuOption = function (newOption) {
+            if (this.menu.selected.key === newOption.key) {
+                return;
+            }
+            this.menu.selected = newOption;
 
-                if (config.clock) {
-                    this.timeAPI.clock(config.clock, config.clockOffsets);
-                    this.timeAPI.timeSystem(config.timeSystem);
-                } else {
-                    this.timeAPI.stopClock();
-                    this.timeAPI.timeSystem(config.timeSystem, config.bounds);
-                }
+            var config = this.getConfig(this.timeAPI.timeSystem(), newOption.clock);
+            if (!config) {
+                // Clock does not support this timeSystem, fallback to first
+                // option provided for clock.
+                config = this.config.menuOptions.filter(function (menuOption) {
+                    return menuOption.clock === (newOption.clock && newOption.clock.key);
+                })[0];
+            }
+
+            if (config.clock) {
+                this.timeAPI.clock(config.clock, config.clockOffsets);
+                this.timeAPI.timeSystem(config.timeSystem);
+            } else {
+                this.timeAPI.stopClock();
+                this.timeAPI.timeSystem(config.timeSystem, config.bounds);
             }
         };
 
diff --git a/src/adapter/runs/TimeSettingsURLHandlerSpec.js b/src/adapter/runs/TimeSettingsURLHandlerSpec.js
index a46ed89881..0d1bce7ecc 100644
--- a/src/adapter/runs/TimeSettingsURLHandlerSpec.js
+++ b/src/adapter/runs/TimeSettingsURLHandlerSpec.js
@@ -48,10 +48,14 @@ define([
         beforeEach(function () {
             clockA = jasmine.createSpyObj('clockA', ['on', 'off']);
             clockA.key = 'clockA';
-            clockA.currentValue = function () { return 1000; }
+            clockA.currentValue = function () {
+                return 1000;
+            };
             clockB = jasmine.createSpyObj('clockB', ['on', 'off']);
             clockB.key = 'clockB';
-            clockB.currentValue = function () { return 2000; }
+            clockB.currentValue = function () {
+                return 2000;
+            };
             timeSystemA = {key: 'timeSystemA'};
             timeSystemB = {key: 'timeSystemB'};
             boundsA = {