From ebd8fdeee3f7818d4ba49db787d18d2c0b171eff Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri, 9 Oct 2015 07:32:46 -0700
Subject: [PATCH] [Time Conductor] Enforce inner minimums on outer changes

---
 .../general/src/controllers/TimeRangeController.js   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js
index c3ded37832..78655a90ae 100644
--- a/platform/commonUI/general/src/controllers/TimeRangeController.js
+++ b/platform/commonUI/general/src/controllers/TimeRangeController.js
@@ -184,8 +184,10 @@ define(
 
                 ngModel.inner.start =
                     Math.max(ngModel.outer.start, ngModel.inner.start);
-                ngModel.inner.end =
-                    Math.max(ngModel.outer.start, ngModel.inner.end);
+                ngModel.inner.end = Math.max(
+                    ngModel.inner.start + innerMinimumSpan,
+                    ngModel.inner.end
+                );
 
                 $scope.startOuterText = formatTimestamp(t);
 
@@ -200,10 +202,12 @@ define(
                     ngModel.outer.start
                 );
 
-                ngModel.inner.start =
-                    Math.min(ngModel.outer.end, ngModel.inner.start);
                 ngModel.inner.end =
                     Math.min(ngModel.outer.end, ngModel.inner.end);
+                ngModel.inner.start = Math.min(
+                    ngModel.inner.end - innerMinimumSpan,
+                    ngModel.inner.start
+                );
 
                 $scope.endOuterText = formatTimestamp(t);