ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-26 00:01:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,880 Commits 989 Branches 212 Tags 191 MiB
8b7af43d6c
Commit Graph

228 Commits

Author SHA1 Message Date
Henry
f96fa33d88 Removed some additional context menu options 2015-12-10 13:49:05 -08:00
Henry
ac379dbb3f [New Edit Mode] Create menu still visible when edit mode initiated by pressing create #407 2015-12-10 10:25:38 -08:00
Henry
a399b78d2c Fixed JSLint errors 2015-12-09 18:39:57 -08:00
Henry
39b3e6c4a9 [Edit Mode] Limit context menu options available for objects in edit mode 
[Edit Mode] Edit mode on objects that do not have a view supporting editing should edit properties instead. #320
 2015-12-09 18:14:17 -08:00
Henry
856c61816c Go to original now shows prompt 2015-12-09 14:08:19 -08:00
Henry
6058e50216 JSLint fixes 2015-12-09 10:04:49 -08:00
Henry
49579378dd [New Edit Mode] Fixed positioning of dropped objects #386 2015-12-09 09:51:00 -08:00
Henry
55ea7a285e Merge remote-tracking branch 'origin/open199e' into open199 2015-12-08 15:17:36 -08:00
Henry
4419a101d6 [New Edit Mode] #199 Disabled all failing tests 2015-12-08 15:15:54 -08:00
Henry
4b7287e51e Fixed JSLint errors 2015-12-08 14:51:25 -08:00
Charles Hacskaylo
6502d36c7a [Frontend] Migrated to s-status-editing 
open #199
open #278
Changed CSS to use s-status-editing instead of .active
class;
Refined style defs to explicitly target tree and
search-results children in order to avoid items in
Inspector Elements pool from being designated as
being edited;
Removed {{searchText}} div from input-filter;
 2015-12-08 14:16:54 -08:00
Henry
18607e9404 Merged from Master 2015-12-07 20:42:09 -08:00
Victor Woeltjen
d5f054e328 [Edit] Test return type 
...from the edit-mode-wrapped persistence capability.
 2015-12-04 11:20:19 -08:00
Victor Woeltjen
03edd26e17 [Edit] Return promise from editable persistence 
https://github.com/nasa/openmctweb/issues/305
 2015-12-01 16:45:08 -08:00
Henry
4f3c9f270b [New Edit Mode Prototype] Hide edit button when in edit mode #350. - Modified edit policy to hide edit button when in edit mode 2015-11-30 17:58:58 -08:00
Henry
64a7647ec3 #279 Added search filter support to elements pool 2015-11-25 11:20:58 -08:00
Henry
c211f413aa [New Edit Mode] Add Elements pool to New Edit Mode #279 2015-11-25 10:40:37 -08:00
Henry
7849803a5d Fixed cancel and drop-initiated edit 2015-11-20 14:00:29 -08:00
Henry
a864c172d5 [Edit Mode Prototype] #278 Added visual indication of edit 2015-11-20 10:07:58 -08:00
Henry
10a44c026c [Edit Mode] Visual indication of object being edited #278 2015-11-19 18:45:18 -08:00
Henry
4ea757faa5 Adding support for object status 2015-11-19 15:12:43 -08:00
Henry
19d2970e0e Merge in "create button initiates edit mode" 2015-11-19 14:13:28 -08:00
Henry
b06a38da2f Fixed incorrect case 2015-11-19 13:17:14 -08:00
Henry
f45e236281 #286 Fixed issues with composition not surviving through create wizard 2015-11-19 13:11:01 -08:00
Henry
2e2b18eaa5 [Edit Mode Prototype] Create button initiates edit-mode immediately #286 2015-11-19 10:33:44 -08:00
Henry
2251a0c1e9 https://github.com/nasa/openmctweb/issues/287 2015-11-17 15:01:13 -08:00
Henry
cd3bdf4f81 Change to navigate by location change 2015-11-16 17:45:31 -08:00
Henry
564a822423 Fixed saving 2015-11-12 17:05:43 -08:00
Henry
16c3229a84 Telemetry Panels now created correctly 2015-11-12 10:22:37 -08:00
Henry
f0e293a513 Virtual panels working again with refactored code 2015-11-11 14:59:00 -08:00
Henry
5f8d13672f Reverted model modified hack 2015-11-11 11:58:15 -08:00
Henry
ba8c2b8468 Fixed buttons not appearing on edit mode click 2015-11-10 22:10:43 -08:00
Charles Hacskaylo
608df8f7b8 Merging in latest github master; resolved conflicts 2015-11-10 16:13:46 -08:00
Charles Hacskaylo
4e79de6156 [Frontend] Apply flex layout to object header elements 
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
 2015-11-06 17:42:54 -08:00
Henry
3e7264d6b8 Initial implementation of virtual panel 2015-10-27 17:38:31 -07:00
Henry
19bdf743fc Added save/cancel 2015-10-26 14:14:56 -07:00
Henry
0fb9f3731a Edit mode and cancel buttons work 2015-10-22 10:09:09 -07:00
Henry
ef250f58de Marged style updates 2015-10-21 12:01:59 -07:00
Charles Hacskaylo
4c84789d5d Frontend] Styling for New Edit Mode 
open #198
.l-flex styles refined;
Animation refinement;
.s-btn default vertical-align = top;
.tool-bar style tweaked;
Added title-label back into edit-action-buttons.html;
 2015-10-21 11:35:36 -07:00
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -07:00
Charles Hacskaylo
5382cca435 [Frontend] Styling for New Edit Mode 
open #198
In-progress styling of toolbar elements;
Revamped edit-action-buttons.html to use only icons;
 2015-10-20 15:43:53 -07:00
Charles Hacskaylo
333f7cb848 [Frontend] Time controller-related styling 
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
 2015-09-29 08:43:34 -07:00
Pete Richards
70bc17c79f Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
Victor Woeltjen
72c122e0ee Merge remote-tracking branch 'github/master' into open95b 
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
 2015-09-15 11:35:25 -07:00
Victor Woeltjen
c6df7cebe5 [Angular] Check for context capability 
Check for existence of context capability from Remove action
during navigation check. This avoids an exception that
appears to have been swallowed in earlier versions of
Angular.
 2015-09-09 17:25:02 -07:00
Charles Hacskaylo
62898c921f Merge branch 'open95' of https://github.com/nasa/openmctweb into open95 2015-09-03 10:37:10 -07:00
Charles Hacskaylo
bb1a02c8bd [Frontend] Significant re-factoring of CSS and markup 
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
 2015-09-02 18:02:58 -07:00
Victor Woeltjen
3310016264 [Properties] Hide rows without controls 
Hide rows for domain object properties that do not have
associated controls from the Edit Properties dialog;
follow up for nasa/openmctweb#92
 2015-09-02 12:01:43 -07:00
Victor Woeltjen
8759fdbd95 [Composition] Update specs 
Update specs to reflect usage of the add method in
the composition capability.
 2015-09-02 09:37:26 -07:00
Victor Woeltjen
b9d8b124ff [Composition] Use composition.add from link action 2015-09-02 09:08:47 -07:00
Shivam Dave
7ffbc9ad2f [Remove Action] Check 
Added check for traverseObject
context because prior to this,
was not checked.
 2015-08-31 13:37:22 -07:00
Shivam Dave
687d86790e [Action] RemoveAction 
Added comments regarding change in
checking of traversed objects.
 2015-08-27 09:49:26 -07:00
Shivam Dave
3ec4cc099b [Action] RemoveAction 
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
 2015-08-27 09:41:00 -07:00
Shivam Dave
dadbf3f6dc [Action] RemoveAction 
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
 2015-08-27 09:17:11 -07:00
Shivam Dave
e7563ff4e9 [Action] Merge 
Merged with master.
 2015-08-26 10:11:23 -07:00
Shivam Dave
a507557cec [Remove] Remove Action 
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
 2015-08-26 10:07:51 -07:00
Shivam Dave
d0183d44c9 [Actions] Remove Action 
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
 2015-08-21 13:04:47 -07:00
Victor Woeltjen
3492cd3942 [Code Style] Fix bug introduced by refactor 
Do some extra checking, since capabilities may have
properties which are note methods. WTD-1482.
 2015-08-12 13:57:17 -07:00
Victor Woeltjen
c450c22ddd [Code Style] Satisfy JSLint 
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
 2015-08-11 13:03:06 -07:00
Victor Woeltjen
aa08db1050 [Code Style] Avoid copying window/scope 
Avoids Angular errors; WTD-1482.
 2015-08-11 11:00:56 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle 
WTD-1482.
 2015-08-10 16:38:13 -07:00
Victor Woeltjen
a7a1ac70e5 [JSDoc] Remove obsolete module references 
WTD-1482.
 2015-08-07 12:14:40 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references 
WTD-1482
 2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Victor Woeltjen
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427 
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
 2015-07-15 13:45:37 -07:00
Sarah Hale
9e6d84a1d5 [Edit] No more tooltips 
Changed the attribute of 'title' on mct-container
to 'label'. This made the tooltips in Edit mode
dissapear. #46.
 2015-07-07 11:14:45 -07:00
Charles Hacskaylo
9d25e3081f [Frontend] Edit mode refactored to use new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:23:56 -07:00
Shivam Dave
2a347f1596 [Windowing] urlService 
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
 2015-06-25 14:53:52 -07:00
Shivam Dave
3d0e0af7f2 [Windowing] Remove variable 
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
 2015-06-25 14:28:38 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
3a371483ab [Windowing] urlService 
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
 2015-06-25 14:07:02 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Victor Woeltjen
0ae1ba4a40 [Edit] Don't wrap non-editable objects 
In Edit mode, don't bother wrapping domain objects which should
not be edited even in principle. Avoids insulating these objects
from updates which occur asynchronously, which in turn avoids
WTD-1291.
 2015-06-17 10:23:16 -07:00
Charles Hacskaylo
0b8d5ceb86 [Fronted] Significant refactoring of btn classes 
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
 2015-06-10 17:23:08 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -07:00
Charles Hacskaylo
aec1176dc4 [Frontend] Hiding non-functional items; padding adjustments 
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
 2015-05-01 10:10:35 -07:00
Victor Woeltjen
3e972650c7 [Containment] Test LinkAction 
Add test cases for LinkAction, added to allow composition
changes to be controlled by policy. WTD-962.
 2015-04-10 17:37:11 -07:00
Victor Woeltjen
f6df73c11b Merge branch 'open-master' into open962 
Merge in latest from open-master into topic branch
for WTD-962
 2015-04-10 17:30:03 -07:00
Victor Woeltjen
79f6e8c082 Merge branch 'open1062' into open-master 
Merge changes for WTD-1062
 2015-04-08 12:48:49 -07:00
Victor Woeltjen
44eb54884b [Containment] Fire a link action on drop 
Fire a link action as the result of a drag-drop operation,
WTD-962.
 2015-04-07 20:35:54 -07:00
Victor Woeltjen
5045795a7c [Containment] Expose Link action as compose 
Expose 'link' as 'compose'; this facilitates implementation of
drag-drop composition being deferred to actions which will
support move/copy/link options in the future. WTD-962.
 2015-04-07 20:24:15 -07:00
Victor Woeltjen
5adcd3cd6d [Containment] Implement Link 
Implement link as a basic action, to separate it out from
drop gesture such that it can be controlled by policy. For
WTD-962.
 2015-04-07 20:20:56 -07:00
Victor Woeltjen
874f81010c [Edit] Update EditController spec 
Update tests for EditController to match updated
usage of domain object API for WTD-1071.
 2015-04-06 09:30:42 -07:00
Victor Woeltjen
8b6a972fa4 [Edit] Avoid double-wrapping 
Avoid double-wrapping editable domain objects, WTD-1071.
 2015-04-06 09:30:14 -07:00
Victor Woeltjen
60ed17e32b [Edit] Add test case for double-wrapping 
Add test case to detect double-wrapping of domain objects
retrieved via the editable domain object cache, identified
as the root cause of WTD-1071.
 2015-04-06 09:28:53 -07:00
Victor Woeltjen
3c3dd0ad17 Merge branch 'open1035' into open-master 
Merge WTD-1035; resolving conflicts to avoid WTD-1069

Conflicts:
	platform/commonUI/edit/src/controllers/EditController.js
	platform/commonUI/edit/src/objects/EditableDomainObjectCache.js
 2015-04-06 08:32:54 -07:00
Victor Woeltjen
9be40d6d2a [Edit] Fill in tests for Edit policies 
Complete tests for policies for Edit actions, WTD-1062.
 2015-04-01 16:21:06 -07:00
Victor Woeltjen
e2c6db8259 [Edit] Stub in specs for Edit policies 
Stub in specs for policies added for Edit mode which control
the availability of the Edit and/or Edit Properties actions
in the view-control area, WTD-1062.
 2015-04-01 16:08:15 -07:00
Victor Woeltjen
0ceb8d30cf [Edit] Expose EditableViewPolicy 
Expose EditableViewPolicy as an active extension in Edit mode,
WTD-1062.
 2015-04-01 16:00:20 -07:00
Victor Woeltjen
facf350648 [Edit] Add policy to restrict views in Edit mode 
Add policy to disallow views in Edit mode which have been
explicitly flagged as non-editable, WTD-1062.
 2015-04-01 15:50:15 -07:00
Victor Woeltjen
ccf2ccc4c6 [Edit] Add policy for the Edit action 
Allow Edit mode only when editable views exist, WTD-1062.
 2015-04-01 15:45:43 -07:00
Victor Woeltjen
e3ec9c6130 [Edit] Allow Edit Properties as a view-control action 
Allow Edit Properties as an action of the view-control category,
WTD-1062.
 2015-04-01 15:34:51 -07:00
Victor Woeltjen
e33b80f150 [Edit] Document mct-before-unload 
Document the behavior of mct-before-unload, added to support
confirmation of navigation changes in Edit mode, WTD-1035.
 2015-03-31 17:16:48 -07:00
Victor Woeltjen
ac6aa3e819 [Edit] Add test cases for mct-before-unload 
Add test cases for behavior to prompt user to confirm
navigation away from unsaved changes, WTD-1035.
 2015-03-31 17:08:38 -07:00
Victor Woeltjen
2e82cffa5a [Edit] Add empty spec for mct-before-unload 
Begin testing mct-before-unload directive, used to confirm navigation
away from unsaved changes, WTD-1035
 2015-03-31 16:00:53 -07:00
Victor Woeltjen
0b0753df31 [Edit] Add test cases 
Add test cases for EditController to account for changes to
support warning dialog when unsaved changes are present,
WTD-1035.
 2015-03-31 15:58:13 -07:00
Victor Woeltjen
dc7d504691 [Edit] Check for route changes 
Respond to route changes via mct-before-unload, in order to
show a prompt to allow the user to confirm navigation changes
which do not trigger onbeforeunload (such as using back to
change the hash route). WTD-1035.
 2015-03-31 14:46:11 -07:00
Victor Woeltjen
5ef382d159 [Edit] Add clarifying comments 
Add clarifying comments related to checking of conditions
on unload, WTD-1035.
 2015-03-31 14:39:30 -07:00
Victor Woeltjen
8a8c84eacf Merge branch 'open-master' into open1035 
Merge in latest changes into topic branch for WTD-1035,
dialog warning before navigating out of Edit mode.
 2015-03-31 14:32:55 -07:00