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

[Timer] Updated Timer UI to indicate playing or paused state

Browse Source 
Removed PauseCheck & TimeOfPause from properties, Removed duplicate functionality Resume class , replaced peeking restart at 0 button with persistent play/pause button
This commit is contained in:
DJ
2017-01-18 07:08:54 -06:00
parent d04bdd2685
commit ecf1bac5c7
15 changed files with 201 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ define([
"./src/actions/RestartTimerAction",
"./src/actions/StopTimerAction",
"./src/actions/PauseTimerAction",
"./src/actions/ResumeTimerAction",
"text!./res/templates/clock.html",
"text!./res/templates/timer.html",
'legacyRegistry'
@@ -44,7 +43,6 @@ define([
RestartTimerAction,
StopTimerAction,
PauseTimerAction,
ResumeTimerAction,
clockTemplate,
timerTemplate,
legacyRegistry
@@ -145,17 +143,6 @@ define([
"cssclass": "icon-play",
"priority": "preferred"
},
{
"key": "timer.restart",
"implementation": RestartTimerAction,
"depends": [
"now"
],
"category": "contextual",
"name": "Restart at 0",
"cssclass": "icon-refresh",
"priority": "preferred"
},
{
"key": "timer.pause",
"implementation": PauseTimerAction,
@@ -168,14 +155,14 @@ define([
"priority": "preferred"
},
{
"key": "timer.resume",
"implementation": ResumeTimerAction,
"key": "timer.restart",
"implementation": RestartTimerAction,
"depends": [
"now"
],
"category": "contextual",
"name": "Resume",
"cssclass": "icon-play",
"name": "Restart at 0",
"cssclass": "icon-refresh",
"priority": "preferred"
},
{
@@ -277,16 +264,6 @@ define([
"name": "hh:mm:ss"
}
]
},
{
"key": "paused",
"control": "boolean",
"name": "PauseCheck"
},
{
"key": "pausedTime",
"control": "long",
"name": "TimeOfPause"
}
],
"model": {