ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 06:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,167 Commits 989 Branches 212 Tags 191 MiB
42361aff25
Commit Graph

1167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
67d1201214 Merge branch 'open-master' into open1272 
Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js
 2015-06-19 13:16:33 -07:00
Victor Woeltjen
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
Victor Woeltjen
dbd7a65a7a Merge remote-tracking branch 'nasa/open1295' into open-master 2015-06-18 18:33:09 -07:00
Victor Woeltjen
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
Victor Woeltjen
00229f01b1 [Plot] Test plot view policy 
Test plot view policy, added in conjunction with image
telemetry; WTD-1170.
 2015-06-18 17:11:11 -07:00
Victor Woeltjen
85e3101d08 [Plot] Expose plot view policy 
Expose policy which suppresses image telemetry (and other
non-numeric telemetry) in plots. WTD-1170.
 2015-06-18 17:00:20 -07:00
Victor Woeltjen
983a9a2f07 Merge remote-tracking branch 'nasa/open1170' into open1170 2015-06-18 16:58:44 -07:00
Victor Woeltjen
66b143c9d7 [Plot] Suppress plot for non-numeric telemetry 
Avoids plot views becoming erroneously available for image
telemetry, WTD-1170.
 2015-06-18 16:58:29 -07:00
Victor Woeltjen
51bd205502 [Imagery] Be flexible about format 
Accept either image or imageUrl as format for image telemetry,
WTD-1170.
 2015-06-18 16:53:52 -07:00
Victor Woeltjen
3512018e90 Merge pull request #15 from shivamndave/issue11 
Addresses #11
 2015-06-18 15:58:24 -07:00
Shivam Dave
0292f046da [Browse Composition] Removed Window Alert 
Removed commented out code that
alerts the user if they cannot
perform a drag and drop. Inserted a
comment marking where an alert can be placed
Issue 11.
 2015-06-18 15:23:51 -07:00
Charles Hacskaylo
0201a4bcf8 [Frontend] Fix to prevent infobubbles from preventing clicks 
GitHub-12
Added CSS class "bubble-container" to BUBBLE_TEMPLATE;
bubble-container utilizes CSS "pointer-events: none";
Changed INFO_HOVER_DELAY constant from 500ms to 2000ms;
 2015-06-18 15:18:42 -07:00
Shivam Dave
dab6d96688 [Browse composition] Not Alerting User 
In this case the user is not alerted. This
is to test the maven build. Issue 11.
 2015-06-18 15:08:13 -07:00
Sarah Hale
1f3c1da8c7 [Browse composition] Alert user 
When the user attempts a disallowed drag and drop composition,
the browser will alert them to this. Issue 11.
 2015-06-18 14:53:35 -07:00
Sarah Hale
451842fb82 [Browse composition] Cleanup 
Removed commented out code in tests. Issue 11.
 2015-06-18 14:29:46 -07:00
Sarah Hale
9e52ddaee7 [Browse composition] Added and modified tests 
Added additional tests to account for the different cases of
edit mode and folder vs non folder. Issue 11.
 2015-06-18 14:26:54 -07:00
Victor Woeltjen
eb2cddc063 [Workers] Satisfy JSLint 
Modify example worker script to satisfy JSLint. #12.
 2015-06-18 11:30:47 -07:00
Victor Woeltjen
640a399278 [Workers] Add example worker 
Add an example worker which inefficiently calculates
fibonacci numbers outside of the UI thread, for #12.
 2015-06-18 11:21:00 -07:00
Victor Woeltjen
7d911a3fe0 [Workers] Add worker service 
Add service for running WebWorkers, #12.
 2015-06-18 10:59:10 -07:00
Shivam Dave
a8488a92d9 [Gestures] Browse/Edit Composition 
Disallows drag and drop during browse mode,
unless dragging and dropping into a folder
view. Allows drag and drop into a layout view
only in edit mode also. Can be unit tested now.
WTD-11.
 2015-06-18 10:54:51 -07:00
Charles Hacskaylo
ab81c9070e [Frontend] Remove static-markup file 
WTD-1170
 2015-06-18 10:09:17 -07:00
Charles Hacskaylo
69f4b4975e Merge branch 'open-master' into open1170b 
Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html
 2015-06-18 09:55:26 -07:00
Charles Hacskaylo
0949ada734 [Frontend] Manual update of platform css, fonts and sass only from open-master 
WTD-1170
 2015-06-18 09:46:54 -07:00
Victor Woeltjen
897433f717 [Imagery] Test ImageryController 
WTD-1170.
 2015-06-17 21:15:17 -07:00
Victor Woeltjen
ba88281bd0 [Imagery] Test mct-background-image 
WTD-1170.
 2015-06-17 20:51:41 -07:00
Victor Woeltjen
c41db4f22b [Imagery] Test policy 
Test policy which restricts the Imagery view to domain objects which
have image telemetry. WTD-1170.
 2015-06-17 20:41:40 -07:00
Victor Woeltjen
8aa25a929a [Imagery] Add skeleton specs 
Add skeleton specs for the Imagery view of telemetry,
WTD-1170.
 2015-06-17 20:35:17 -07:00
Victor Woeltjen
2690a8b8e2 [Imagery] Add JSDoc 
Add JSDoc to classes implementing the Imagery view, WTD-1170.
 2015-06-17 20:31:47 -07:00
Victor Woeltjen
12954f8fc3 [Imagery] Add open-in-new-tab button 
Add button to open current telemetry image in a new tab,
WTD-1282 (in the context of WTD-1170.)
 2015-06-17 20:21:53 -07:00
Victor Woeltjen
5a4a912f79 [Imagery] Only display images when loaded 
Wait until image telemetry is completely loaded before
displaying it, WTD-1170.
 2015-06-17 20:12:04 -07:00
Victor Woeltjen
dc85d3c191 Merge pull request #4 from nasa/open884 
[Info Bubble] Add info bubble
 2015-06-17 11:47:34 -07:00
Charles Hacskaylo
2677dcd10c Merge branch 'open-master' into open1295 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_main.scss
 2015-06-17 11:00:53 -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
Victor Woeltjen
ee69eb3a01 [Addressability] Fix code style 
Change code style to satisfy JSLint for changes from WTD-1149.
 2015-06-16 16:10:31 -07:00
Victor Woeltjen
5849f8afe2 [Addressability] Add spec for BrowseObjectController 
Add spec for BrowseObjectController, added to track current
view selection from/to query string params, WTD-1149.
 2015-06-16 16:09:22 -07:00
Victor Woeltjen
c1c633db80 [Addressability] Add test cases 
Add test cases to BrowseController which reflect changes for
addressability, WTD-1149.
 2015-06-16 15:57:08 -07:00
Victor Woeltjen
bcb4e9c495 [Addressability] Remove excessive check 
Remove unneeded check from ViewSwitcherController; not necessary
to avoid overwriting query string selection of view. WTD-1149.
 2015-06-16 15:40:19 -07:00
Victor Woeltjen
699cd3bd90 [Addressability] Update spec for BrowseController 
Update spec to reflect changes for BrowseController to support
addressability of domain objects, WTD-1149.
 2015-06-16 15:35:40 -07:00
Victor Woeltjen
9942e24039 [Addressability] Work around reload again 
Work around Angular's page refresh on URL change to avoid
unintended effects when chosen view changes (such as tree
collapse), WTD-1149.
 2015-06-16 15:23:55 -07:00
Victor Woeltjen
d559dae1e2 [Addressability] Expose current view in query param 
Expose the currently selected view as a query string parameter,
WTD-1149.
 2015-06-16 15:09:42 -07:00
Victor Woeltjen
fec6f06849 [Addressability] Obey view query string param 
Obey the query string parameter for a view, if present.
WTD-1149.
 2015-06-16 14:58:03 -07:00
Victor Woeltjen
26fd56a003 [Addressability] Handle bad paths 
Handle paths that cannot be completely followed, WTD-1149.
 2015-06-16 14:35:15 -07:00
Victor Woeltjen
d7b79b6b69 [Addressability] Preserve nav. state on leaving Edit 
Preserve navigation state when leaving Edit mode, in the context
of addressability changes. WTD-1149.
 2015-06-16 14:29:22 -07:00
Charles Hacskaylo
c428df524c Merging in open1248, resolve conflicts 2015-06-16 14:07:53 -07:00
Charles Hacskaylo
4887ba0e58 Merge in open-master, resolve conflicts 2015-06-16 13:53:00 -07:00
Victor Woeltjen
3738ea16d7 [Addressability] Update route without reinstantiating 
Work around normal behavior of Angular when path changes;
instead of reinstantiating controller for Browse mode
when Browse-initiated path changes occur, act as if the
route hadn't changed (so that the URL updates but the
currently-displayed state, e.g. tree expansion, is
preserved.) WTD-1149.
 2015-06-16 13:44:35 -07:00
Victor Woeltjen
084d6b6859 [Addressability] Update path on navigation 
Update path in browse mode when navigation state changes.
WTD-1149.
 2015-06-16 13:28:19 -07:00
Victor Woeltjen
9fae2db04a [Addressability] Infer ROOT 
Treat the path element for the root domain object as implicit, such
that it does not appear in the full URL. WTD-1149.
 2015-06-16 13:16:55 -07:00
Victor Woeltjen
8f18d88705 [Addressability] Navigate down path from params 
Traverse down the path from route parameters to initially navigate to a
domain object in Browse mode. WTD-1149.
 2015-06-16 13:14:12 -07:00
Victor Woeltjen
f24db1561e [Addressability] Get IDs from URL 
Add a route parameter to Browse mode which includes domain
object identifiers. WTD-1149.
 2015-06-16 13:00:03 -07:00