ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,711 Commits 989 Branches 212 Tags 191 MiB
bb04d9db4a
Commit Graph

221 Commits

Author SHA1 Message Date
Charles Hacskaylo
4f7ca98b60 Merge branch 'master' into nem468a. 
Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
 2016-01-11 13:29:26 -08:00
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Henry
367d1b0247 [Edit] Drag-drop on folder triggers edit mode #420 2015-12-11 16:14:00 -08:00
Victor Woeltjen
de88bf94d4 [Documentation] Fix type declaration 
Rephrase parameter type to something JSDoc can parse.

https://github.com/nasa/openmctweb/issues/411
 2015-12-11 10:51:16 -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
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
b5c741c911 Merge branch 'master' into open199 2015-12-08 15:42:37 -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
Victor Woeltjen
6cef663db5 [Representation] Add ending newline 2015-12-08 13:43:41 -08:00
Victor Woeltjen
b2f5861458 [Representation] Test template prefetcher 2015-12-08 13:29:11 -08:00
Victor Woeltjen
f8809ce67f [Representation] Also prefetch containers 2015-12-08 13:06:24 -08:00
Victor Woeltjen
3498b0a50a [Representation] Prefetch templates 
...to ensure that dialogs et al can be displayed, even
after loss of network connectivity.

https://github.com/nasa/openmctweb/issues/383
 2015-12-08 12:59:18 -08:00
Henry
18607e9404 Merged from Master 2015-12-07 20:42:09 -08:00
Victor Woeltjen
386f1f20ff [Representation] Test switching between links 
Add test case to verify that representation gets refreshed
when switching among two linked instances of the same
domain object.
 2015-12-02 10:49:18 -08:00
Victor Woeltjen
5e07951892 [Representation] Handle missing context 
Handle missing context when generating an ID path;
this is missing in the root object.
 2015-12-02 10:23:11 -08:00
Victor Woeltjen
2514e44083 [Representation] Check full ID path 
...when determining if a representation needs to be
refreshed. Avoids representations becoming stale
when switching or navigating among linked instances
of the same domain object.

https://github.com/nasa/openmctweb/issues/302
 2015-12-02 10:21:00 -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
acb7d4b807 renamed variable 2015-11-30 09:35:44 -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
Henry
9eb8158c4e [Edit Mode] Disallow context menu actions on tree items during edit mode. #277 2015-11-25 14:44:31 -08:00
Henry
7849803a5d Fixed cancel and drop-initiated edit 2015-11-20 14:00:29 -08:00
Henry
2251a0c1e9 https://github.com/nasa/openmctweb/issues/287 2015-11-17 15:01:13 -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
4c0a79116a Added refresh check for editability 2015-11-11 11:52:30 -08:00
Henry
1d0af0b3b6 Drop Gesture 2015-11-10 20:27:04 -08:00
Henry
e3cac49c4b Fixed UUID import 2015-11-10 16:26:04 -08:00
Charles Hacskaylo
608df8f7b8 Merging in latest github master; resolved conflicts 2015-11-10 16:13:46 -08:00
Victor Woeltjen
ae928a138c [Representation] Update compilation approach 
Update compilation approach for templateLinker to more
closely resemble ng-include; minimizes likelihood of
subtle behavioral differences (e.g. incorrect size
selection for split pane)
 2015-10-30 16:37:47 -07:00
Victor Woeltjen
454a63e1f1 [Representation] Destroy scopes before adding 
Destroy representation scope before adding elements back into
the DOM; avoids having a momentary activation of watches and
listeners on those scopes before they are replaced with newly
compiled content for new scopes.
 2015-10-30 16:18:01 -07:00
Victor Woeltjen
b487fa4438 [Representation] Update TemplateLinker spec 
...to reflect creation of a new scope each time a template
is changed.
 2015-10-30 16:01:24 -07:00
Victor Woeltjen
560454e7c2 [Representation] Verify change before representing 
An mct-representation may have a refresh triggered either by
a key change or a domain object change; both will typically
happen in the same digest cycle. Track what prior state was
an abort refreshes if nothing will change.
 2015-10-30 15:55:56 -07:00
Victor Woeltjen
04594ea536 [Representation] Rebuild scopes on every change 
Create new scopes on every changeTemplate request, even if
the same template is being viewed; presume that we want a
new instance of the same template. Avoids scope reuse for
cases such as switching from a plot of one object to a
plot of another object.
 2015-10-30 15:32:20 -07:00
Victor Woeltjen
a45dfc3822 [Representation] Don't reuse scopes 
Addresses nasa/openmctweb#227
 2015-10-30 15:09:35 -07:00
Victor Woeltjen
4abb48abd8 [Representation] Update parameters in JSDoc 2015-10-30 13:34:13 -07:00
Victor Woeltjen
a38d4829eb [Representation] Add JSDoc 2015-10-30 12:38:32 -07:00
Victor Woeltjen
d5f1d45759 [Representation] Use $templateRequest 
...from templateLinker, to remove the need to use $http and
to explicitly cache templates.
 2015-10-30 12:35:36 -07:00
Victor Woeltjen
5ed34c1c30 [Representation] Build URLs from templateLinker 2015-10-30 11:02:13 -07:00
Victor Woeltjen
5b475c9f64 [Representation] Add more test cases 
...for TemplateLinker.
 2015-10-29 08:27:20 -07:00
Victor Woeltjen
a48370abd3 [Representation] Update spec 2015-10-29 08:18:13 -07:00
Victor Woeltjen
54d608adb2 [Representation] Provide initial templates 
...to avoid temporarily replacing with a comment when this
is not needed.
 2015-10-29 08:17:25 -07:00
Victor Woeltjen
5fba6f5ead [Representation] Add more test cases 
...for TemplateLinker, to achieve full code coverage.
 2015-10-29 08:08:01 -07:00
Victor Woeltjen
b177c38656 [Representation] Add JSDoc 
...to TelemetryLinker.
 2015-10-29 07:58:32 -07:00
Victor Woeltjen
59cd346911 [Representation] Add test cases 
...for TemplateLinker
 2015-10-28 17:01:13 -07:00
Victor Woeltjen
e7e66bff4b [Representation] Begin adding TemplateLinker spec 2015-10-28 16:49:19 -07:00
Victor Woeltjen
ca62cc9066 [Representation] Update spec for mct-representation 
...to account for usage of templateLinker to add or remove the
whole element from the DOM when there is or is not a template
to show.
 2015-10-28 16:35:11 -07:00
Victor Woeltjen
01b6fda1f2 [Representation] Update spec for mct-include 
...to account for usage of templateLinker to add or remove the
whole element from the DOM when there is or is not a template
to show.
 2015-10-28 16:11:00 -07:00
Victor Woeltjen
c5fcc5a558 [Representation] Handle edge cases 
Handle edge cases (e.g. directive priorities, race conditions)
to ensure that mct-representation and mct-include display correctly
when added to or removed from the DOM.
 2015-10-28 15:57:47 -07:00
Victor Woeltjen
0404303042 [Representation] Move changes back 
Move changed lines back to their original location to simplify
diff.
 2015-10-28 15:38:11 -07:00
Victor Woeltjen
5677548298 [Representation] Show element synchronously 
...to avoid exceptions when trying to invoke representers
before an mct-representation has been added back into the
DOM.
 2015-10-28 15:32:50 -07:00
Victor Woeltjen
bcc42d705e [Representation] Hide elements without transclusion 2015-10-28 15:30:27 -07:00
Victor Woeltjen
ab008ae497 [Representation] Begin integration 
...of templateLinker into mct-representation. Not working currently
due to prevalence of mct-representation instances with transcluding
directives (hitting a multiple transclusion error.)
 2015-10-28 15:17:36 -07:00
Andrew Henry
8fb6ab61ba Fixed folders 2015-10-28 14:56:34 -07:00
Victor Woeltjen
3d59f6df0b [Representation] Separate out template loading/linking 
...from mct-include, to facilitate reuse for MCTRepresentation.
 2015-10-28 14:51:30 -07:00
Andrew Henry
929f06e6c1 Working on folders 2015-10-28 13:35:52 -07:00
Andrew Henry
e9e6ddd791 Trying to fix drop on folders 2015-10-28 13:01:45 -07:00
Andrew Henry
2539e4008f Improved handling of virtual panels 2015-10-28 12:53:50 -07:00
Victor Woeltjen
b4a44dee8f [Representation] Populate mct-include contents 
Remove usage of ng-include and template from mct-include for
compatibility with element-level transclusion. Has useful
side effect of pre-fetching templates and reducing watch
count.
 2015-10-28 11:13:53 -07:00
Victor Woeltjen
942f617bd8 [Representation] Use transclusion for mct-include 
...to add/remove conditionally depending on the existence of
certain templates.

Note that this currently breaks mct-include due to an incompatibility
between element transclusion and directive templates; see
https://github.com/angular/angular.js/issues/3368.
 2015-10-28 10:29:46 -07:00
Victor Woeltjen
757cb0f015 [Representation] Watch for key changes 
...from mct-include. Improves behavior of that directive and supports
testing of changes to remove whole elements when inapplicable,
nasa/openmctweb#195.
 2015-10-28 10:18:59 -07: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
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -07:00
Victor Woeltjen
13095b4135 [Context Menu] Update specs 
Update specs to reflect refactoring-out of popup elements
performed in the context of adding time conductor, WTD-1515.
 2015-10-02 14:14:34 -07:00
Victor Woeltjen
445f22ccb0 [Context Menu] Use popupService to display menus 2015-10-02 11:01:49 -07:00
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Pete Richards
8b7a94dcf8 [Style] Remove unused variables, excess whitespace 
Clean up unused variables and excess whitespace to match style guide.
 2015-09-22 11:14:55 -07:00
Victor Woeltjen
fa186a1556 [Mobile] Update agentService usages 2015-09-18 10:07:27 -07:00
Victor Woeltjen
29c460556a [Representers] Destroy representers 
Invoke the destroy methods of any active representers when
a scope is destroyed; supports time controller, which needs
to accurately track when it has or hasn't been attached to
a view. WTD-1515
 2015-09-04 16:00:43 -07:00
Shivam Dave
63b41d796a [Mobile] Clean Up 
Cleaned up context menu gesture
comments with spacing.
 2015-08-27 12:06:25 -07:00
Shivam Dave
cd46dab5c1 [Mobile] Merge 
Merged with master and resolved conflicts.
 2015-08-25 12:36:50 -07:00
Victor Woeltjen
86f0a9100f [Code Style] Fix merge error 
Fix merge error in ContextMenuAction which caused
test failure. WTD-1482.
 2015-08-17 16:57:46 -07:00
Victor Woeltjen
f4ae86eb53 Merge remote-tracking branch 'github/master' into open1482c 
Conflicts:
	platform/representation/src/actions/ContextMenuAction.js
 2015-08-17 15:05:34 -07:00
Victor Woeltjen
365134b085 [Code Style] Use prototypes in representation bundle 
WTD-1482
 2015-08-14 16:13:46 -07:00
Victor Woeltjen
2d5ec97dc3 [Menu] Listen to element directly 
Add listener to menu element directly instead of
using ng-click to aid in testing (and for consistency
with related listeners.) WTD-1506.
 2015-08-07 14:39:59 -07:00
Victor Woeltjen
87aa0cfce2 [Menus] Dismiss menu when clicked 
Addresses WTD-1506 (context menu does not disappear after
action is chosen); listen for click events on the menu
itself and dismiss the menu when these occur.
 2015-08-07 14:34:27 -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
Shivam Dave
dcd7d61c9a [Mobile] Tests 
Completed ContextMenu and InfoButton
Gesture tests where elements/body
touch events occur.
 2015-08-06 13:43:56 -07:00
Shivam Dave
0b635afcf7 [Mobile] Tests 
ContextMenu and InfoButton Gesture
tests remain.
 2015-08-05 12:14:16 -07:00
Shivam Dave
f46a0853b9 [Mobile] Tests 
Removed mockMenu from ContextMenuGestureSpec.
 2015-08-04 16:58:37 -07:00
Shivam Dave
6b65ae77e7 [Mobile] Tests 
Completed tests for AgentService,
InfoService, and ContextMenuAction.
ContextMenu and InfoButton Gesture
tests remain. Also resized info button
icon.
 2015-08-04 16:48:41 -07:00
Shivam Dave
3d524d7572 [Mobile] AgentService 
Replaced name queryService with agentService.
 2015-08-04 10:11:25 -07:00
Shivam Dave
85658d3d1f [Mobile] Tests 
Removed tests causing incomplete
build.
 2015-07-30 13:33:59 -07:00
Shivam Dave
ddce0f371d [Mobile] Test 
Removed extra mockEvent from test.
 2015-07-30 13:32:24 -07:00
Shivam Dave
495cd06ed5 [Mobile] Tests 
adjusted test to fill empty
functions.
 2015-07-30 13:30:03 -07:00
Shivam Dave
c333a2e70a [Mobile] Test 
Repeat of test variable deleted.
 2015-07-29 16:31:38 -07:00
Shivam Dave
906354764b [Mobile] Tests 
Has way to make isMobile call
true or false for mobile/nonmobile
devices.
 2015-07-29 15:06:39 -07:00
Shivam Dave
7cc14a195b [Mobile] Tests/Header 
Removes back arrow on desktops.
Also added queryService to tests
for the context menu action and
gesture.
 2015-07-29 10:00:03 -07:00
Shivam Dave
84b9e4d781 [Mobile] Context Menu 
Context menu next to object header
now dismisses when touching away
from it. Also, when long touching
an object, the context menu appears.
Set on 500ms timeout.
 2015-07-28 17:09:15 -07:00
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -07:00
Shivam Dave
30c530178a [Mobile] No ContextMenu 
Removed context menu code
started to be used for the
long hold gesture.
 2015-07-27 11:01:03 -07:00