From 9d6b70f43319e2d204be25b21ce58794f88ffff2 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed, 2 Sep 2015 17:25:41 -0700
Subject: [PATCH] [Time Conductor] Handle middle drag

WTD-1515
---
 .../src/controllers/TimeConductorController.js  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/platform/commonUI/general/src/controllers/TimeConductorController.js b/platform/commonUI/general/src/controllers/TimeConductorController.js
index 17a4298577..ea978a10c3 100644
--- a/platform/commonUI/general/src/controllers/TimeConductorController.js
+++ b/platform/commonUI/general/src/controllers/TimeConductorController.js
@@ -106,7 +106,7 @@ define(
             function startMiddleDrag() {
                 initialDragValue = [
                     $scope.ngModel.inner[0],
-                    $scope.ngModel.inner[0]
+                    $scope.ngModel.inner[1]
                 ];
             }
 
@@ -142,24 +142,27 @@ define(
             function middleDrag(pixels) {
                 var delta = toMillis(pixels),
                     index = delta < 0 ? 0 : 1,
-                    opposite = (index === 0) ? 1 : 0,
-                    span = initialDragValue[opposite] - initialDragValue[index];
+                    opposite = Math.abs(1 - index);
 
+                // Adjust the position of the edge in the direction of drag
                 $scope.ngModel.inner[index] = clamp(
                     initialDragValue[index] + delta,
                     $scope.ngModel.outer[0],
                     $scope.ngModel.outer[1]
                 );
-                $scope.ngModel.inner[opposite] =
-                    $scope.ngModel.inner[index] + span;
+                // Adjust opposite knob to maintain span
+                $scope.ngModel.inner[opposite] = $scope.ngModel.inner[index] +
+                    initialDragValue[opposite] - initialDragValue[index];
+
+                updateFromParameters($scope.ngModel);
             }
 
             $scope.startLeftDrag = startLeftDrag;
             $scope.startRightDrag = startRightDrag;
-            //$scope.startMiddleDrag = startMiddleDrag;
+            $scope.startMiddleDrag = startMiddleDrag;
             $scope.leftDrag = leftDrag;
             $scope.rightDrag = rightDrag;
-            //$scope.middleDrag = middleDrag;
+            $scope.middleDrag = middleDrag;
 
             $scope.state = false;
             $scope.ticks = [];