Updated modes

nasa · Jul 11, 2016 · 11caa83 · 11caa83
1 parent 0017b77
commit 11caa83
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html b/platform/features/conductor-v2/res/templates/mode-selector/mode-menu.html
@@ -22,8 +22,8 @@
 <div class="contents">
     <div class="pane left menu-items">
         <ul>
-            <li ng-repeat="option in ngModel.options"
-                ng-click="ngModel.selected=option.key">
+            <li ng-repeat="(selected, option) in ngModel.options"
+                ng-click="ngModel.selected=selected">
                 <a
                    ng-mouseover="representation.activeMetadata = option"
                    ng-mouseleave="representation.activeMetadata = undefined">

diff --git a/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html b/platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
@@ -39,7 +39,7 @@
 <span ng-controller="ClickAwayController as modeController">
     <div class="s-menu-btn"
          ng-click="modeController.toggle()">
-		<span class="title-label">{{ngModel.selected}}</span>
+		<span class="title-label">{{ngModel.options[ngModel.selected].label}}</span>
     </div>
     <div class="menu super-menu mini mode-selector-menu"
          ng-show="modeController.isActive()">

diff --git a/platform/features/conductor-v2/src/TimeConductorController.js b/platform/features/conductor-v2/src/TimeConductorController.js
@@ -62,26 +62,26 @@ define(
 
             $scope.modeModel = {
                 selected: 'fixed',
-                options: [
-                    {
-                        key: 'fixed',
+                options: {
+                    'fixed': {
                         glyph: '\ue604',
+                        label: 'Fixed',
                         name: 'Fixed Timespan Mode',
                         description: 'Query and explore data that falls between two fixed datetimes.'
                     },
-                    {
-                        key: 'realtime',
+                    'realtime': {
                         glyph: '\u0043',
+                        label: 'Real-time',
                         name: 'Real-time Mode',
                         description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
                     },
-                    {
-                        key: 'latest',
+                    'latest': {
                         glyph: '\u0044',
+                        label: 'Latest',
                         name: 'Latest Available Data Mode',
                         description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'
                     }
-                ]
+                }
             }
         }