ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-07 13:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,995 Commits 991 Branches 212 Tags 192 MiB
2542255342
Commit Graph

760 Commits

Author SHA1 Message Date
slhale
94531a39d0 Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice 2015-08-12 13:17:17 -07:00
slhale
eefc746567 [Search] Fix results display 
Search results are now properly displayed again.
 2015-08-12 13:05:30 -07:00
slhale
0218bad9e8 [Search] Clear icon padding and transition 2015-08-12 12:58:22 -07:00
slhale
dd993c81a7 [Search] Clear icon working 
Clicking on the clear icon now clears
the input text in the search bar.
 2015-08-12 12:46:01 -07:00
slhale
a76e54483a [Search] Clear icon tweaks 
Comments and CSS. Still not clickable.
 2015-08-12 11:20:02 -07:00
slhale
3555f41f3e [Search] Adding clear text button 
It is in place, but clicking on it does nothing yet.
 2015-08-12 10:27:34 -07:00
slhale
9939c809be [Search] Adjust result list padding 2015-08-11 14:43:06 -07:00
slhale
89cb6867bd Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-08-11 14:32:39 -07:00
slhale
98801cb5d6 [Search] Remove unnecissary 2015-08-11 14:31:12 -07:00
slhale
23bc246a48 [Search] Search icon 
Search icon now is not visible when text is
entered in the search bar, even when the bar
is not in focus.
 2015-08-11 13:18:05 -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
slhale
a48a0820ad [Search] Search icon transition 2015-08-11 10:56:31 -07:00
slhale
7b471e5379 [Search] Search icon 
Moved the search icon to appear within the
text input area, and dissapears when the
input area is focused.
 2015-08-11 10:35:08 -07:00
Victor Woeltjen
de291ad3b1 [Code Style] Use prototypes in inspection bundle 
WTD-1482
 2015-08-11 10:00:56 -07:00
Victor Woeltjen
140d767026 [Code Style] Use prototypes in general UI bundle 
WTD-1482.
 2015-08-11 09:47:54 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle 
WTD-1482.
 2015-08-10 16:38:13 -07:00
Victor Woeltjen
efc42aa8f2 [Code Style] Use prototypes in Dialog bundle 
WTD-1482.
 2015-08-10 12:53:55 -07:00
Victor Woeltjen
f8a0ddb484 [Code Style] Avoid retaining reference to window 
Avoid https://docs.angularjs.org/error/ng/cpws
by changing way reference to  is retained.
WTD-1482.
 2015-08-10 12:39:56 -07:00
Victor Woeltjen
a77920bd18 [Code Style] Use prototypes in Browse bundle 
WTD-1482.
 2015-08-10 11:52:23 -07:00
Victor Woeltjen
78146d97f8 [Code Style] Use prototypes in About bundle 
WTD-1482.
 2015-08-10 10:19:02 -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
slhale
7141c2818a [Search] Search icon near input 
Added a search icon next to the search bar
input.
 2015-08-06 16:59:09 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -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
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
Shivam Dave
63a99f26f6 Merge branch 'mobile_3' into mobile 2015-08-06 14:13:13 -07:00
Shivam Dave
7ca15a9de2 [Mobile] Representation 
Edited grid item to center
shared button.
 2015-08-06 14:11:59 -07:00
Shivam Dave
7ac1d2458a Merge remote-tracking branch 'origin/mobile_3' into mobile 2015-08-06 13:45:45 -07:00
Shivam Dave
0bc4f2dc6e Merge remote-tracking branch 'upstream/master' into mobile 2015-08-06 13:45:37 -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
Pete Richards
37cd73c6e8 [Template] Move ng-click to parent node 
Move the ng-click directive to the li element to match the element that receives
hover styles.

Fixes nasa/openmctweb#60.
 2015-08-05 17:11:30 -07:00
Shivam Dave
0a39984c4f [Mobile] Clean Up 
Fixed InfoService having 0 in
wrong spot. Also correctly compared
the UserAgent device to iPhone for
isMobile function in AgentService.
 2015-08-05 12:26:09 -07:00
Shivam Dave
0b635afcf7 [Mobile] Tests 
ContextMenu and InfoButton Gesture
tests remain.
 2015-08-05 12:14:16 -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
66408eeec8 [Mobile] Gestures 
Now to dismiss bubble, touch anywhere
the touch will not fire other gestures
(such as the pressing of another object).
 2015-08-04 13:41:48 -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
slhale
ec87ac7652 [Search] Comments 2015-08-04 10:37:47 -07:00
slhale
8f65c73c8a [Search] Recompile CSS 
To make changes to the Sass reflected.
 2015-08-04 10:36:46 -07:00
slhale
35316dc31c [Search] Clean up 
Removed additional reference to searhc UI, as well
as correct persistence provider.
 2015-08-04 10:35:15 -07:00
slhale
b6bb689ccc [Search] Remove search UI files 
Leaving only search service related files.
 2015-08-04 10:31:52 -07:00
Shivam Dave
3d524d7572 [Mobile] AgentService 
Replaced name queryService with agentService.
 2015-08-04 10:11:25 -07:00
Shivam Dave
9b922913a0 [Mobile] Gestures 
Added styling to back and selection
arrow (tree). Also increased the space
allowed for selection arrow on tree item.
Info Button created on grid items for mobile.
Info bubble appears on tablet like desktop.
Also on mobile, info bubble fits to width.
New QueryService that returns if on iPhone.
Also formatted dialog box so that their is no
margin and takes up fullscreen on mobile.
 2015-08-04 09:59:08 -07:00
slhale
4439e1680d [Search] Update CSS 
Scrolling now does not move the search input
field. Load more text always stays on one line.
 2015-08-03 13:49:53 -07:00
slhale
5569ef8b2d Revert "[Search] Update CSS" 
This reverts commit e05f16d780.
 2015-08-03 13:39:22 -07:00
slhale
e05f16d780 [Search] Update CSS 
Slight tweak to the padding of the search view,
which affects where the top of the scroll bar
appears. Also removed the search scroll div
because it was unused.
 2015-08-03 13:26:29 -07:00
Shivam Dave
560a2e035e [Mobile] Info Button 
Added info button to grid/list items
on mobile. When the button is pressed,
info bubble appears for 750ms or the
same infobutton is pressed to dismiss
immediately.
 2015-07-31 11:13:52 -07:00
Shivam Dave
25e8bb44d2 [Mobile] Item Height 
Adjusted item height in
folder/layout list to be
automatically same as the
list object, not flowing over.
Applied to both phones and tablets.
 2015-07-30 14:10:43 -07:00
Shivam Dave
1624866656 [Mobile/Bug] RemoveAction 
When removing object you have
openned, now compares the currentObj
id with the removed obj id, resulting
in navigating to parent if they are the
same.
 2015-07-30 13:27:56 -07:00
Shivam Dave
2d1aa65d63 [Mobile] Test 
BrowseController test adjusted to
repeat less code.
 2015-07-30 12:50:39 -07:00
Shivam Dave
12ec293f3d [Mobile] Tests 
Changed BrowseController and RemoveActionSpec to account
for grandparent and navigation usage. Also changed
RemoveAction variable name.
 2015-07-29 13:57:11 -07:00
Shivam Dave
bdf8b4d3f1 [Mobile] Test for Back Arrow 
Added tests for the backarrow and
when it appears/disappears.
 2015-07-29 13:22:47 -07:00
Shivam Dave
6e60088b11 [Mobile] RemoveAction 
Removed console and added
navigationService (mock) to the
spec version.
 2015-07-29 11:58:53 -07:00
Shivam Dave
97bf530b1d [Mobile] BackArrow 
Removed the BackArrow console log
that was getting called in the
BrowseController.
 2015-07-29 11:41:10 -07:00
Shivam Dave
18348476c6 [Mobile] RemoveAction Tweak 
If you remove an object you are
currently within/opened, then on
removal of it you navigate to the
parent of whatever you removed.
 2015-07-29 11:38:47 -07:00
Shivam Dave
7e35e55f0b [Mobile] Hide Back Button 
When you are at the highest level the
back button fades out and is unclickable.
When you are able to go up a level the
back button appears/fades in and is
pressable. Also removed the object type
name from the header.
 2015-07-29 11:13:09 -07:00
Shivam Dave
28a2a5b92a [Mobile] Tweaks to layout 
Removed the user-select option
for the context menu and bottom bar
on mobile. Also edited the folder
grid item so that its icon rep
size is not overly large.
 2015-07-29 10:39:17 -07:00
Shivam Dave
d262520594 [Mobile] Tree menu Open 
Tree menu select arrow button's width
is now size of full button. Prior to this
the pressable area was less and therefore
less responsive.
 2015-07-29 10:25:09 -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
356fa73c91 [Mobile] Tests 
Test created for backArrow
that spies on all objects
used to find parent.
 2015-07-28 15:55:22 -07:00
Shivam Dave
a073ef69ac [Mobile] Back Arrow 
Shifted Back Arrow down to
align with header.
 2015-07-28 15:15:42 -07:00
Shivam Dave
3c6c420023 [Mobile] Back Arrow 
Back Arrow implemented
by getting parent and then
navigating to it.
 2015-07-28 15:08:14 -07:00
slhale
32b58715c6 [Search] Fixed scrolling and layout edit 
Changed the CSS so that scrolling for the tree and
search results works again. Additionally, layout
editing works again.
 2015-07-28 12:33:22 -07:00
Shivam Dave
2a4943f584 [Mobile] Console 
Removed call to console so
mvn clean install would compile.
 2015-07-28 10:58:22 -07:00
Shivam Dave
e32403a75f [Mobile] Clean-Up 
Cleaned the unused code for the
backArrow and long touch gestures.
Commented out functions for later use
Currently shows the back arrow, however,
only will print to console on press.
Edited tests where mobile checks were breaking
and fixed.
 2015-07-28 10:56:29 -07:00
slhale
561d671181 [Search] Fix to pass test 
Changing TreeNodeController's isSelected function
back to original, so that it doesn't break tests.
 2015-07-28 09:50:50 -07:00
Shivam Dave
b0c42c12b7 [Mobile] Back Arrow 
Changes URL correctly that
is printed to the console. Is the
url to up one level of objects.
However not navigating to that
object.
 2015-07-27 17:01:30 -07:00
Shivam Dave
621ccc25ec [Mobile] Back Arrow HTML 
Created HTMl for back arrow,
next neew to hook up a click.
 2015-07-27 15:31:47 -07:00
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -07:00
Shivam Dave
1d7a0fa48d [Mobile] Removed InfoGesture 
Commented out infogesture.
 2015-07-27 11:30:29 -07:00
Shivam Dave
3d0795cde3 [Mobile] Starting Context 
Added check to make sure
user is touching only one object.
Started contextmenugesture to be
long touch, however currently long
touch is still infogesture.
 2015-07-27 10:20:08 -07:00
Shivam Dave
c85a3787c0 [Mobile] User-Select 
Edited user-select used in
panes' layout to only
happen on phones and tablets
(just to be safe).
 2015-07-24 16:46:45 -07:00
Shivam Dave
066258ab83 [Mobile] User-Select 
Removes the copy/define
mobile safari menu that
appears during some touch events.
Only apply to left and right panes.
 2015-07-24 16:19:15 -07:00
Shivam Dave
ddc2295ec3 [Mobile] Touch Hold Gesture 
Rough touch hold gesture added
to the info gesture. Currently
if you hold on an item (that you
would normally hover over) for
500ms, you get the info gesture pop
up.
 2015-07-24 16:02:06 -07:00
Shivam Dave
011e6fc512 [Mobile] Clean Up 
Moved Mobile check in InfoGesture to
call on mouseEnter.
 2015-07-24 15:27:33 -07:00
shale
6b02295bf4 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-24 14:20:27 -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
shale
9143f5febd [Search] Comments and errors 
Changed TreeNodeController slightly to do error
checking. Also updated some comments.
 2015-07-24 13:03:18 -07:00
Shivam Dave
91bd58215a [Mobile] Size Adjustment 
Moved hamburger icon slightly up
using the padding instead of
margin.
 2015-07-24 12:38:01 -07:00
Shivam Dave
b37ee19fbc [Mobile] Size Adjustment 
Adjusted indentation size
on the tree. Also change size of the
hamburger icon to match the
object icon and moved it slightly
down.
 2015-07-24 12:35:19 -07:00
Shivam Dave
2355d354b3 [Mobile] Items List 
Flushes items left and
vertically centers the
title/details. Also cleaned
up the items classes in sass
files.
 2015-07-24 11:46:58 -07:00
Shivam Dave
a89f9eed42 [Mobile] Grid List/Gestures 
Context menu only shown with contextmenu
click on desktops (non-mobile devices). Also
edited items list in a folder's representation
to show the icon on the left side, with text
centered horizontally (only mobile).
 2015-07-23 16:47:57 -07:00
shale
341218e8f6 [Search] Tree hide change 
The tree is now hidden whenever there is
text in the search bar. (This allows for
the case when there are no search results,
but text in the search bar.)
 2015-07-23 16:24:38 -07:00
shale
7d495f6389 [Search] Hide tree 
The tree is hidden when there are
search results.
 2015-07-23 15:55:20 -07:00
shale
0feab1965c [Search] Attempt at scroll bars 
Attempted to make the search results scroll,
but failed for now. Created a div for the
search results, load icon, and load more
button, which are the elements desired to
be scrolled. Did not work because search
result labels have absolute position text.
 2015-07-23 15:12:13 -07:00
Shivam Dave
7993e4c03f [Mobile] Gestures 
Removed the hover coloring on
the tree menu on mobile by changing
original** scss code. Also added
check in ContextMenuGesture that
will only allow context menu to appear
in non-mobile browser.
 2015-07-23 15:01:14 -07:00
Shivam Dave
b592b89dc8 [Mobile] Clean Up 
Removed unnecessary transitions.:
 2015-07-23 14:15:01 -07:00
Shivam Dave
d115166dde [Mobile] Comments 
Added comments and removed
unwanted spec test code for
BrowseController.
 2015-07-23 13:48:21 -07:00
Shivam Dave
d176f9f811 [Mobile] Test 
Fixed BrowseControllerSpec.js to
account for the .treeslide
call and added a new test for thatasds
 2015-07-23 13:46:46 -07:00
shale
aa17d3034e [Search] Fixed excessive calls to setSelection 
There were excessive calls to TreeNodeController's
setSelection() due to a modification for search
compatibility. Changed to not call as often.
 2015-07-23 13:32:15 -07:00
shale
52a9fcf5d6 [Search] Changed highlight size 
The search item highlight when selected or
hovered over is now talled, and the margin
between search items is reduced to
counteract any effect to spacing.
 2015-07-23 13:29:11 -07:00
Shivam Dave
143e3eeb6c [Mobile] CleanUp/Tests 
Added tests inside spec files
for the QueryService, TreeNodeController,
and InfoGesture. Also cleaned up the
tree so that padding is used between
buttons instead of margins.
 2015-07-23 13:19:58 -07:00
shale
7b271dcb6b [Search] Highlight transitions 
Added transitions for when objects get
highlighted from selection or hover.
 2015-07-23 13:14:20 -07:00