From bb993dc94f46f7bb7e061eecf07d73838270ee9f Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon, 11 Jan 2016 18:16:07 -0800
Subject: [PATCH] [Time Conductor] Don't update invalid bounds

Don't enforce minimum time span when bounds are invalid;
https://github.com/nasa/openmctweb/issues/325#issuecomment-170755787
---
 .../src/controllers/TimeRangeController.js    | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js
index 13db6313ef..f72a19b05b 100644
--- a/platform/commonUI/general/src/controllers/TimeRangeController.js
+++ b/platform/commonUI/general/src/controllers/TimeRangeController.js
@@ -185,13 +185,6 @@ define(
             function updateOuterStart(t) {
                 var ngModel = $scope.ngModel;
 
-                ngModel.outer.start = t;
-
-                ngModel.outer.end = Math.max(
-                    ngModel.outer.start + outerMinimumSpan,
-                    ngModel.outer.end
-                );
-
                 ngModel.inner.start =
                     Math.max(ngModel.outer.start, ngModel.inner.start);
                 ngModel.inner.end = Math.max(
@@ -207,13 +200,6 @@ define(
             function updateOuterEnd(t) {
                 var ngModel = $scope.ngModel;
 
-                ngModel.outer.end = t;
-
-                ngModel.outer.start = Math.min(
-                    ngModel.outer.end - outerMinimumSpan,
-                    ngModel.outer.start
-                );
-
                 ngModel.inner.end =
                     Math.min(ngModel.outer.end, ngModel.inner.end);
                 ngModel.inner.start = Math.min(
@@ -233,19 +219,20 @@ define(
             }
 
             function updateBoundsFromForm() {
-                $scope.ngModel = $scope.ngModel || {};
-                $scope.ngModel.outer = {
-                    start: $scope.formModel.start,
-                    end: $scope.formModel.end
-                };
+                var start = $scope.formModel.start,
+                    end = $scope.formModel.end;
+                if (end >= start + outerMinimumSpan) {
+                    $scope.ngModel = $scope.ngModel || {};
+                    $scope.ngModel.outer = { start: start, end: end };
+                }
             }
 
             function validateStart(startValue) {
-                return startValue <= $scope.ngModel.outer.end - outerMinimumSpan;
+                return startValue <= $scope.formModel.end - outerMinimumSpan;
             }
 
             function validateEnd(endValue) {
-                return endValue >= $scope.ngModel.outer.start + outerMinimumSpan;
+                return endValue >= $scope.formModel.start + outerMinimumSpan;
             }
 
             $scope.startLeftDrag = startLeftDrag;