alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into open-623

Browse Source
This commit is contained in:
DJ Johnson
2017-04-29 17:10:27 -05:00
committed by GitHub
parent 5aa93ba50c 1d7d963a4f
commit 8fb9306272
1011 changed files with 7691 additions and 4905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/features/clock/bundle.js
View File

@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2016, United States Government
* Open MCT, Copyright (c) 2014-2017, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
@@ -140,7 +140,7 @@ define([
],
"category": "contextual",
"name": "Start",
"cssclass": "icon-play",
"cssClass": "icon-play",
"priority": "preferred"
},
{
@@ -162,7 +162,7 @@ define([
],
"category": "contextual",
"name": "Restart at 0",
"cssclass": "icon-refresh",
"cssClass": "icon-refresh",
"priority": "preferred"
},
{
@@ -181,7 +181,7 @@ define([
{
"key": "clock",
"name": "Clock",
"cssclass": "icon-clock",
"cssClass": "icon-clock",
"description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.",
"priority": 101,
"features": [
@@ -209,7 +209,7 @@ define([
"name": "hh:mm:ss"
}
],
"cssclass": "l-inline"
"cssClass": "l-inline"
},
{
"control": "select",
@@ -223,7 +223,7 @@ define([
"name": "24hr"
}
],
"cssclass": "l-inline"
"cssClass": "l-inline"
}
]
}
@@ -238,7 +238,7 @@ define([
{
"key": "timer",
"name": "Timer",
"cssclass": "icon-timer",
"cssClass": "icon-timer",
"description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.",
"priority": 100,
"features": [

2
platform/features/clock/res/templates/clock.html
View File

@@ -31,4 +31,4 @@
{{clock.ampm()}}
</span>
</div>
</div>
</div>

2
platform/features/clock/res/templates/timer.html
View File

@@ -36,4 +36,4 @@
</span>
<span ng-controller="RefreshingController"></span>
</div>
</div>
</div>

1
platform/features/clock/test/controllers/TimerControllerSpec.js
View File

@@ -91,6 +91,7 @@ define(
'timer.stop': mockStop
}[k]];
});
mockStart.getMetadata.andReturn({cssclass: "icon-play", name: "Start"});
mockPause.getMetadata.andReturn({cssclass: "icon-pause", name: "Pause"});
mockStop.getMetadata.andReturn({cssclass: "icon-box", name: "Stop"});