Pete Richards
9523c918fb
Merge remote-tracking branch 'github-open/open182' into open-master
2015-11-03 15:52:14 -08:00
Victor Woeltjen
4300338b9c
Merge pull request #186 from nasa/open155
...
[Notifications] Add notification infrastructure
2015-11-03 15:38:41 -08:00
Victor Woeltjen
0dccaab9cb
[Search] Declare UI components as templates
...
Declare Search UI components as templates instead of
representations so that they are not removed from the
DOM when no domain object is supplied. Fixes
nasa/openmctweb#234
2015-11-02 14:07:22 -08:00
Victor Woeltjen
2d1faeba8c
[Time Conductor] Update FormatService JSDoc
2015-11-02 12:30:18 -08:00
Victor Woeltjen
cecc52f0a9
[Time Conductor] Update formatService usages
...
...to remove checks for unknown formats.
2015-11-02 12:28:46 -08:00
Victor Woeltjen
a1d765f271
[Time Conductor] Throw errors for unknown formats
...
Per code review, nasa/openmctweb#204
2015-11-02 12:23:13 -08:00
Charles Hacskaylo
d926110b4e
Merge remote-tracking branch 'github/open155' into open155c
...
open #186
open #155
Re-rendering css;
2015-10-30 16:26:49 -07:00
Charles Hacskaylo
485e6a9de1
[wtf] Merge open155 > github/master
...
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
2015-10-30 16:24:20 -07:00
Charles Hacskaylo
1e6731e6f2
Merge open155 > github/master
...
open155
open186
Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00
Victor Woeltjen
796d6b800a
[Time Conductor] Add JSDoc for params
2015-10-30 14:08:11 -07:00
Victor Woeltjen
b12bb55495
[Time Conductor] Update text on format change
...
...in a date-time field.
2015-10-30 13:57:21 -07:00
Victor Woeltjen
f42498ab60
[Time Conductor] Update specs
...
...to reflect changes to how unspecified versus unknown formats
are handled.
2015-10-30 13:53:33 -07:00
Victor Woeltjen
7f571415dc
[Time Conductor] Change format handling
...
Use default format when no format is specified, and throw an
error when a specified format is unrecognized, from both
date-time field controller and time range controller.
2015-10-30 13:28:01 -07:00
Victor Woeltjen
4f9a65a5fe
[Time Conductor] Use default format
...
...from TelemetryFormatter, and log when a requested format
is unavailable.
2015-10-30 13:17:53 -07:00
Victor Woeltjen
6db7f056dc
[Time Conductor] Warn about unknown formats
2015-10-30 13:11:13 -07:00
Henry
bc82a5bf7e
Added additional test for notifications specified as string message
2015-10-30 10:56:16 -07:00
Victor Woeltjen
5af3d575a2
[Representation] Remove redundant listener
...
The event is already listened-for at the representation
level to trigger cleanup, including gestures, so the info gesture
does not need to listen for it as well.
Per code review feedback, nasa/openmctweb#222
2015-10-30 10:45:44 -07:00
Henry
58198636ed
Fixed jslint complaints
2015-10-30 10:32:01 -07:00
Henry
86bf6c6dff
Minor refactoring and renaming of variables
2015-10-30 10:30:39 -07:00
Henry
0e07fb860e
Added convenience methods for alert and error to the NotificationService
2015-10-30 10:28:08 -07:00
Henry
b3d4f48e2e
Allow string or model to simplify message specification
2015-10-30 10:22:24 -07:00
Victor Woeltjen
b6d08726fb
[Time Conductor] Remove duplicate format
2015-10-30 09:34:23 -07:00
Victor Woeltjen
ea9f607bba
[Representation] Handle undefined scope
...
element.scope() may be undefined when wiring in the info
gesture, so check for that.
That this is sometimes undefined appears to be a consequence
of changes to mct-representation, but which changes influence
this are unclear. In any event, it appears that this cannot
be relied-upon per https://github.com/angular/angular.js/issues/9515
2015-10-28 15:49:18 -07:00
Victor Woeltjen
90389ea910
[Time Conductor] Increase test specificity
...
Explicitly check for boolean values (not just truthy/falsy values)
per feedback from code review, nasa/openmctweb#204 .
2015-10-28 09:56:50 -07:00
Victor Woeltjen
0ad22f6842
[Time Conductor] Add JSDoc to new bundle
...
Add JSDoc to platform/commonUI/formats, introduced to support
different time formats from the time conductor.
nasa/openmctweb#182 .
2015-10-28 08:29:56 -07:00
Victor Woeltjen
00c0019122
[Time Conductor] Add test cases
...
...to cover FormatProvider.
2015-10-27 17:44:57 -07:00
Victor Woeltjen
e80d094174
[Time Conductor] Add test cases
...
...to cover UTCTimeFormat.
2015-10-27 17:39:16 -07:00
Victor Woeltjen
60ba80d307
[Time Conductor] Add empty specs
...
...to platform/commonUI/formats bundle, introduced to support
formatting of non-UTC time domains for time conductor.
2015-10-27 17:34:28 -07:00
Victor Woeltjen
c89aa026b0
[Time Conductor] Add JSDoc for Format interface
2015-10-27 17:31:02 -07:00
Victor Woeltjen
8a3f77d784
[Time Conductor] Simplify bundle name
2015-10-27 17:26:08 -07:00
Victor Woeltjen
9e8152719f
[Time Conductor] Add spec
...
Add spec for DateTimeFieldController, bringing over test cases
removed from TimeRangeController.
2015-10-27 17:12:03 -07:00
Victor Woeltjen
8ba112498b
[Time Conductor] Add test case for formats
...
Add test case to TimeRangeController to reflect that it responds
to changes in format selection.
2015-10-27 15:57:44 -07:00
Victor Woeltjen
44fc9423df
Merge branch 'open-master' into open182
...
Merge in latest from master branch into topic branch
for nasa/openmctweb#182
2015-10-27 15:54:18 -07:00
Victor Woeltjen
920c83771d
[Time Conductor] Update spec
...
...for TimeRangeController to reflect separation of date-time
inputs into a separate control.
Additionally, removed unused function.
2015-10-27 14:06:02 -07:00
Victor Woeltjen
cc8a7e513f
[Time Conductor] Rename bundle
...
Rename platform/time to platform/commonUI/formatting; nothing
particularly specific to time about these interfaces, and
removal of non-formatting-related methods makes this essentially
a UI concern.
2015-10-27 13:11:04 -07:00
Victor Woeltjen
9dce3a04cc
[Time Conductor] Remove obsolete code
...
Remove code related to handling text input from TimeRangeController;
moved into DateTimeFieldController.
2015-10-27 13:07:58 -07:00
Victor Woeltjen
18cdaf1b53
[Time Conductor] Fix extension definition
...
For date time field controller; refer to correct implementation.
2015-10-27 13:03:04 -07:00
Victor Woeltjen
e5d4376f06
[Time Conductor] Use date time field
...
...from template for time controller.
2015-10-27 13:01:27 -07:00
Victor Woeltjen
6784c6567b
[Time Conductor] Add date-time field
...
Add mct-control which includes both the date-time picker and
its corresponding text entry area, per code review feedback
from nasa/openmctweb#204 .
2015-10-27 13:00:42 -07:00
Victor Woeltjen
71618ce4b9
[Time Conductor] Hide date-picker for non-UTC formats
2015-10-27 12:40:14 -07:00
Charles Hacskaylo
5d5425db04
[Frontend] Finessing and verifying CSS
...
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
2015-10-27 11:50:16 -07:00
Victor Woeltjen
7bd0e279b0
Merge remote-tracking branch 'github/master' into open182
...
Merge latest from master branch into topic branch for
nasa/openmctweb#182
2015-10-27 11:49:36 -07:00
Charles Hacskaylo
a8856c0612
[Frontend] Platform-specific mods to limits
...
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
2015-10-27 11:43:28 -07:00
Victor Woeltjen
82b321b3f9
[Time Conductor] Update displayed text when format changes
2015-10-27 10:28:32 -07:00
Victor Woeltjen
aa23d358cc
[Time Conductor] Use formatService instead of timeService
2015-10-26 10:03:49 -07:00
Pete Richards
3d996ac466
[RequireJS] Specify path for uuid
...
Specify path for uuid, making it available for any code that would require it,
without that code needing to know the path to it.
Fixes https://github.com/nasa/openmctweb/issues/211 .
2015-10-23 16:32:05 -07:00
Henry
896dd8d2c7
Fixed jslint errors
2015-10-23 16:30:51 -07:00
Henry
789b640b9b
Refactored dismiss and minimize out of NotificationService and on to returned Notification type
2015-10-23 16:28:42 -07:00
Henry
e05858e26b
Added newline to end of source files
2015-10-23 12:11:37 -07:00
Henry
89046ecad5
fixed jslint error
2015-10-23 12:03:56 -07:00