ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-01 00:45:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
1,406 Commits 997 Branches 212 Tags 193 MiB
Commit Graph

1265 Commits

Author SHA1 Message Date
Pete Richards
62f335573a [Build] Bump PhantomJS Version 
Bump PhantomJS version to latest (for ES5 support) and upgrade
dependencies as necessary.
 2015-08-06 16:04:58 -07:00
Pete Richards
c80e9bfa26 [Style] JSLint Compliance 2015-08-06 15:21:28 -07:00
Pete Richards
ec62c27f36 [Representations] grid-item and label display links 
grid-item and label representations now use the "location" capability
to determine whether or not to show a link indicator.
 2015-08-06 15:12:02 -07:00
Pete Richards
19b80ded16 Merge remote-tracking branch 'origin/open1423' into open-965 2015-08-06 15:10:52 -07:00
Pete Richards
f72f88adfa [Location] Use parent id as location 
Use the parent id as the location for a model.

This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.

Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
 2015-08-06 15:05:47 -07:00
Pete Richards
f083d019a3 [Entanglement] Move service recursively updates locations 
When moving an object that supports composition, child objects which
are originals must have their location updated as well.  Children which
are links should not have their location updated, nor should any of
their children be updated.
 2015-08-06 15:05:47 -07:00
Pete Richards
10ec30ba76 [Entanglement] MoveService updates the location of moved objects 
The move service updates the location of moved objects when those
objects are originals.
 2015-08-06 15:05:46 -07:00
Pete Richards
3fb4296d23 [Testing] MockLinkService returns linked object 
MockLinkService.perform returns a promise for the linked domainObject.

When resolving the promise and not specifying an object to resolve it
with, it will resolve it with the domainObject that was originally
passed to it.
 2015-08-06 15:05:46 -07:00
Pete Richards
197ec0eb2c [Tests] Update Link Service Tests 2015-08-06 15:05:42 -07:00
Pete Richards
1d162888dd [Tests] Fix location capability tests 2015-08-06 15:05:00 -07:00
Pete Richards
3783ed69d7 [Entanglement] Move updates location of originals 
When moving original objects, the location is updated to match the new
location.
 2015-08-06 15:03:08 -07:00
Pete Richards
4a755e259f [Entanglement] Link service returns object in new context 
The link service return the object in the new context.
 2015-08-06 14:55:50 -07:00
Pete Richards
4c56e4ffdc [Test] add a synchronous controlled promise for testing 
Add ControlledPromise, a synchronous promise that can be controlled,
allowing for easier testing of promise resolution flow.
 2015-08-06 14:53:59 -07:00
Pete Richards
449db4f3a9 [Templates] Add stubs for link indicator 
Update templates to use the location capability to show an indicator.
 2015-08-06 14:52:42 -07:00
larkin
9ea1d24121 [Entanglement] Add LocationCapability 
DomainObjects with a context capability also gain a LocationCapability.

This capability allows you to determine the location of the current
instance of a domain object, and also provides methods for determining
if the current instance of a domain object is a link, or if it is an
original.
 2015-08-04 11:24:50 -07:00
larkin
40e85b718d [Creation] Store location of new objects 
The creation service stores the location (the full path) to
the domain object as "model.location"
 2015-08-04 11:24:50 -07:00
Victor Woeltjen
2ca3c6ea93 [Layout] Use consistent whitespace 
Use consistent whitespace in array literals, WTD-1424.
 2015-08-04 10:00:44 -07:00
Victor Woeltjen
a4c704a5a2 [Layout] Ensure minimum frame size 
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
 2015-08-03 12:18:49 -07:00
Victor Woeltjen
77edb07333 Merge pull request #52 from nasa/continuous-deployment 
Support continuous deployment of open source Open MCT Web.
 2015-07-27 07:51:54 -07:00
Victor Woeltjen
9435e75461 Merge remote-tracking branch 'slhale/open33' into open47b 
Fix merge conflict in preparation to integrate nasa/openmctweb#47

Conflicts:
	platform/commonUI/browse/res/templates/browse/object-header.html
 2015-07-24 13:46:37 -07:00
Pete Richards
cb56bbe569 [Documentation] Fix JSDoc syntax errors 2015-07-21 14:30:00 -07:00
Victor Woeltjen
2e2e7ee876 Merge branch 'open1444b' into open-master 2015-07-17 11:05:25 -07:00
Victor Woeltjen
affd5f8d29 Merge branch 'open1426' into open-master 2015-07-17 10:56:09 -07:00
Victor Woeltjen
deed95d8d1 [Plot] Don't allocate charts for empty plots 
Don't allocate WebGL charts for empty plots, WTD-1444.
 2015-07-17 09:13:20 -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
Victor Woeltjen
ea19bde1e7 [Telemetry] Provide empty series 
Provide an empty series when a historical telemetry request
does not return anything for a given telemetry point.
Addresses WTD-1426.
 2015-07-14 15:51:13 -07:00
shale
aa091a9d26 [Browse] Update tests 
Removed reference to destroy() in the
context menu action test. #33, #47.
 2015-07-14 13:53:00 -07:00
shale
1455e5d8b5 [Browse] Removed destroy functions 
Removed destroy functions from menu arrow
controller and contetxt menu action as
suggested. #33, #47.
 2015-07-14 13:25:25 -07:00
shale
d1b55bd43e Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-14 13:20: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
Sarah Hale
b2a23ee968 [Browse] Tests completed 
Completed the menu arrow controller test. All
tests are now completed. #33.
 2015-07-07 09:28:01 -07:00
Sarah Hale
e3a96eff8d [Browse] Fixed clicking on menu 
Previously any click on the context menu would
close the context menu rather than doing the
appropriate action. This is now fixed. The menu
only closes when a click happens not on the
menu. #33.
 2015-07-02 15:34:11 -07:00
Sarah Hale
2b67ae42bf [Browse] Gesture and action tests 
The menu gesture and the menu action tests
are completed. #33.
 2015-07-02 14:00:54 -07:00
Sarah Hale
db920a7b5c [Browse] Starting tests 
Created new test files for the additions. #33.
 2015-07-02 12:50:48 -07:00
Sarah Hale
a582375e61 [Browse] Style 
All modified code follows style guides. #33.
 2015-07-02 12:38:32 -07:00
Sarah Hale
2524c75505 [Browse] Menu arrow works 
The menu arrow now displays a context menu
when clicked. #33.
 2015-07-02 12:36:35 -07:00
Sarah Hale
c08f972ab4 [Browse] Menu action called correctly 
Both the menu gesture and the menu arrow now
correctly call the menu action. #33.
 2015-07-02 11:57:03 -07:00
Sarah Hale
809a6e457c Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-02 11:33:07 -07:00
Sarah Hale
30d8c1647c [Browse] Right click works 
Right clicking for a context menu now
works again. #33.
 2015-07-02 11:30:45 -07:00
Sarah Hale
4e6301edb4 [Browse] Fixed multiple clicks 
Fixed having multiple calls to ContextMenuGesture. #33.
 2015-07-02 10:58:19 -07:00
Sarah Hale
3edd967e27 [Browse] Changed action key 
Changed the key for the context menu action from
'contextMenu' to 'menu'. #33.
 2015-07-02 10:30:45 -07:00
Sarah Hale
bb80b2175c [Browse] Gesture calling action 
The context menu gesture (attempts) to call the
context menu action. The menu arrow still fails
to call. #33.
 2015-07-02 09:36:19 -07:00
Sarah Hale
e9989ae00d [Browse] Some progress 
Still doesn't work.
 2015-07-01 14:32:49 -07:00
Charles Hacskaylo
fd98bdae4c [Frontend] Added $colorIconLink in _constants 
WTD-1404
 2015-07-01 10:07:47 -07:00
Charles Hacskaylo
793d39b969 [Frontend] CSS and font updates ONLY from open1423 
WTD-1404
CSS has error at this point due to missing $colorIconLink in _constants.scss;
(cherry picked from commit 2a032bf)
 2015-07-01 10:04:45 -07:00
Charles Hacskaylo
7e89c13839 [Frontend] Markup updates to label and grid-item 
WTD-1423
Depends on CSS and font updates in 2a032bf
 2015-07-01 09:50:53 -07:00
Charles Hacskaylo
2a032bf66d [Frontend] CSS and font updates ONLY from open1423 
WTD-1423
Cherry-pick this into open1404 to get latest fonts and CSS into open-master;
 2015-07-01 09:48:35 -07:00
Charles Hacskaylo
e0727e8485 [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Added small icon to upper right;
IN PROGRESS;
 2015-06-30 18:13:17 -07:00
Charles Hacskaylo
d5d7ac90ac [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Grid item version with link at bottom right of main icon;
 2015-06-30 17:58:56 -07:00
larkin
3e5fa30d9d [Style] Add stub for label link icon 2015-06-30 16:18:37 -07:00