diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index 33242ccdcf..cd239c7d08 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -57,6 +57,11 @@
}
],
"controllers": [
+ {
+ "key": "TimeConductorController",
+ "implementation": "controllers/TimeConductorController.js",
+ "depends": [ "$scope" ]
+ },
{
"key": "TreeNodeController",
"implementation": "controllers/TreeNodeController.js",
diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html
index fe1b6ff14a..346b1b7143 100644
--- a/platform/commonUI/general/res/templates/controls/time-controller.html
+++ b/platform/commonUI/general/res/templates/controls/time-controller.html
@@ -22,48 +22,40 @@ properly on the range left and right bounds.
-->
-
+
diff --git a/platform/commonUI/general/src/controllers/TimeConductorController.js b/platform/commonUI/general/src/controllers/TimeConductorController.js
new file mode 100644
index 0000000000..a186651c0c
--- /dev/null
+++ b/platform/commonUI/general/src/controllers/TimeConductorController.js
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT Web includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define,Promise*/
+
+define(
+ [],
+ function () {
+ "use strict";
+
+ /**
+ * A ToggleController is used to activate/deactivate things.
+ * A common usage is for "twistie"
+ *
+ * @memberof platform/commonUI/general
+ * @constructor
+ */
+ function TimeConductorController($scope) {
+ var tickCount = 2;
+
+ $scope.state = false;
+
+ $scope.ticks = [0, 1];
+
+ function updateTicks() {
+ var i;
+ $scope.ticks = [];
+ for (i = 0; i < tickCount; i += 1) {
+ $scope.ticks.push(i / (tickCount - 1));
+ }
+ }
+
+ function updateSpanWidth(w) {
+ // Space about 100px apart
+ tickCount = Math.max(Math.floor(w / 100), 2);
+ updateTicks();
+ }
+
+ $scope.$watch("spanWidth", updateSpanWidth);
+ }
+
+ return TimeConductorController;
+ }
+);