Henry
6fb6f54cfa
Fixed objects being dropped twice in fixed layout
2015-11-27 15:21:24 -08:00
Victor Woeltjen
b5e52fce75
[Time Conductor] Remove redundant test block
2015-11-27 14:48:48 -08:00
Victor Woeltjen
3afcb52934
[Time Conductor] Use ng-blur from template
2015-11-27 14:35:51 -08:00
Victor Woeltjen
677b0cffec
[Time Conductor] Test form isolation
...
Verify that form inputs are ignored until some explicit trigger
2015-11-27 14:33:35 -08:00
Victor Woeltjen
248bc68f0d
[Time Conductor] Test restoration of old values
...
...and clarify name of the function in scope which does this.
2015-11-27 14:23:30 -08:00
Henry
9a42cb4f7e
Merge branch 'open277' into open199
2015-11-27 14:16:59 -08:00
Henry
b573b3a681
Amended change so that context menu only suppressed on navigation menu
2015-11-27 14:16:37 -08:00
Henry
6558461fda
Reverted changes after refactor
2015-11-27 13:05:55 -08:00
Henry
4b23e3fbcb
Refactored changes to ContextMenuGesture.js
2015-11-27 13:02:19 -08:00
Victor Woeltjen
57d23c3696
[Time Conductor] Add missing license header
2015-11-27 12:37:51 -08:00
Victor Woeltjen
8babfc5ca9
[Time Conductor] Propogate blur from text field
2015-11-27 12:37:23 -08:00
Victor Woeltjen
271b5d1a73
[Time Conductor] Test choices via picker
...
...to ensure that they trigger blur events. Also, test changes
via text entry to ensure that they don't (the template is responsible
for this.)
2015-11-27 12:36:40 -08:00
Victor Woeltjen
7d4e7a0925
[Time Conductor] Allow ng-blur on mct-controls
2015-11-27 12:29:53 -08:00
Victor Woeltjen
3fd4304de1
Merge pull request #345 from nasa/open32
...
[Layout] Layout rebuilds after resize/reposition #32
2015-11-27 09:59:01 -08:00
Henry
db7224486c
[Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32
2015-11-25 19:11:29 -08:00
Henry
6d0f3c7faa
[Layout] Layout rebuilds after resize/reposition #32
...
Refactored layoutPanels method
Fixed JSLint errors
fixed failing tests
2015-11-25 15:30:33 -08:00
Henry
988323bdbd
merged Open32
2015-11-25 14:59:47 -08:00
Henry
9eb8158c4e
[Edit Mode] Disallow context menu actions on tree items during edit mode. #277
2015-11-25 14:44:31 -08:00
Henry
3b9cd5f1ac
Merge branch 'open279-proto' into open199-merge
2015-11-25 11:25:00 -08:00
Victor Woeltjen
ffff13205a
[Time Conductor] Check for value changes
...
...on watches triggered from the picker. Only want to
trigger a submit when this actually constitutes a change from
the datetime field's underlying model (to avoid triggering
form submission when datetime picker is initialized.)
2015-11-25 11:21:51 -08:00
Henry
64a7647ec3
#279 Added search filter support to elements pool
2015-11-25 11:20:58 -08:00
Victor Woeltjen
16efd85dfc
[Time Conductor] Submit immediately on picker changes
2015-11-25 11:16:31 -08:00
Victor Woeltjen
1ef09ffbdd
[Time Conductor] Restore last valid values
...
Restore last valid values on blur, in a date-time entry field.
2015-11-25 11:12:41 -08:00
Victor Woeltjen
976ecce075
[Time Conductor] Update model on submit/blur
2015-11-25 11:09:11 -08:00
Victor Woeltjen
87a51a9eb3
[Time Conductor] Listen for blur, submit
...
https://github.com/nasa/openmctweb/issues/259
2015-11-25 11:02:03 -08:00
Henry
9ed10ba9da
Merge branch 'open279-proto' into open199-merge
2015-11-25 10:47:21 -08:00
Henry
c211f413aa
[New Edit Mode] Add Elements pool to New Edit Mode #279
2015-11-25 10:40:37 -08:00
Henry
268a2c2427
Merged from master
2015-11-25 09:04:11 -08:00
Henry
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -08:00
Victor Woeltjen
15ec9df538
Merge pull request #327 from nasa/open208b
...
[Timelines] Bring over CSS
2015-11-23 10:38:02 -08:00
Victor Woeltjen
7974ffdda2
Merge remote-tracking branch 'github/master' into open245b
...
...in preparation to complete merge nasa/openmctweb#257
Conflicts:
platform/entanglement/src/actions/CopyAction.js
platform/entanglement/src/actions/LinkAction.js
platform/entanglement/src/actions/MoveAction.js
2015-11-21 07:05:51 -08:00
Victor Woeltjen
d5858622ba
[Persistence] Fix grammar in JSDoc
...
...and add some explanation of METHOD_DEFAULTS.
2015-11-21 06:59:12 -08:00
Victor Woeltjen
096fee8b6d
Merge remote-tracking branch 'github/master' into open208b
...
Conflicts:
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-21 06:42:45 -08:00
Victor Woeltjen
0635e7c38e
[Timeline] Disambiguate datetime control
...
Timeline uses a custom date-time control on creation;
use a distinct key for this to avoid a naming collision
with platform's datetime. Addresses abnormal behavior
identified in nasa/openmctweb#208
2015-11-20 17:26:43 -08:00
Victor Woeltjen
845b1dcd6f
Merge pull request #321 from nasa/open169
...
Review and integrate open169
2015-11-20 17:13:39 -08:00
Victor Woeltjen
e6c9cbf0cd
[Persistence] Clarify JSDoc
...
Per code review feedback, nasa/openmctweb#257
2015-11-20 17:08:39 -08:00
Charles Hacskaylo
fd3059b380
[Frontend] Final cleanups, tweaks; Refactored s-icon-btn
...
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
2015-11-20 16:47:04 -08:00
Charles Hacskaylo
5a7349117a
[Frontend] Cleanups to Timeline tabular label elements
...
open #208
Colors normalized for theming;
2015-11-20 16:27:26 -08:00
Charles Hacskaylo
50134bbc7f
[Frontend] Theming and cleanups in Clocks and Timers
...
open #208
Also converted timer to use flexbox layout;
2015-11-20 16:19:27 -08:00
Charles Hacskaylo
3854df27d8
[Frontend] Styling on Timeline zoom buttons
...
open #208
Fixed in both themes;
2015-11-20 15:42:08 -08:00
Charles Hacskaylo
fc53dbd8a4
[Frontend] Themes added to Timelines
...
open #208
Espresso and Snow now supported; bulk of
work done except for minor cleanups, like zoom
buttons; Dragging not working currently in Timelines;
2015-11-20 15:23:08 -08:00
Henry
7849803a5d
Fixed cancel and drop-initiated edit
2015-11-20 14:00:29 -08:00
akhenry
fb0ba0cff9
Merge pull request #323 from nasa/open251
...
Review and integrate open251
2015-11-20 13:30:24 -08:00
akhenry
573e5608fc
Merge pull request #319 from nasa/open-status-tracking
...
[Status] Add status tracking
2015-11-20 13:18:09 -08:00
Victor Woeltjen
37a7c2b1df
Merge pull request #309 from nasa/open308
...
[Workers] Allow web workers to be shared
2015-11-20 11:40:26 -08:00
Henry
4f0f9e4104
Merge branch 'open-status-tracking' into open278
2015-11-20 11:28:06 -08:00
Henry
e6054b8252
#287 - modified to use s-status-editing, but CSS needed
2015-11-20 11:23:34 -08:00
Victor Woeltjen
38274728f6
[Workers] Update JSDoc
...
...per review feedback, nasa/openmctweb#309
2015-11-20 11:12:29 -08:00
Henry
a864c172d5
[Edit Mode Prototype] #278 Added visual indication of edit
2015-11-20 10:07:58 -08:00
Victor Woeltjen
400b992ec3
[Status] Revise API
...
Change method names, add a getter to status capability;
per code review feedback, nasa/openmctweb#319 .
2015-11-20 09:46:08 -08:00
