e8bc9ecc1a
[Search, Mobile] Merge
...
Merged search/master into mobile. Adjusted the
search bar to work on branch and fit accordingly.
2015-08-25 15:27:21 -07:00
d80c359a86
[Mobile] Tests
...
Fixed BrowseControllerSpec test
to account for new call. Now
expects destroy and select-obj calls.
2015-08-25 14:20:36 -07:00
cd46dab5c1
[Mobile] Merge
...
Merged with master and resolved conflicts.
2015-08-25 12:36:50 -07:00
6a2bdd103b
[Mobile] Hide Tree
...
On selecting a node in the tree, if the
user is on phone and in portrait, than
emit up to the browse controller to call
treeSlide(), which will hide the tree menu.
Also adjusted the agent service to properly
check for orientation using window.innerHeight/
Width. Also created function for the selection
of an object in BrowseController.
2015-08-24 16:17:58 -07:00
c81e2dbb4a
Merge branch 'master' of https://github.com/nasa/openmctweb into search
...
Conflicts:
platform/commonUI/general/src/controllers/TreeNodeController.js
platform/persistence/elastic/src/ElasticSearchProvider.js
2015-08-24 13:14:43 -07:00
f27e4d6e06
Merge branch 'open-master' into open1482c
...
Merge in latest in preparation to merge; WTD-1482
Conflicts:
platform/commonUI/browse/src/creation/CreationService.js
platform/core/src/models/RootModelProvider.js
platform/entanglement/src/services/LinkService.js
platform/entanglement/src/services/MoveService.js
2015-08-19 15:00:52 -07:00
432ec519b6
Merge branch 'search' into open70
...
Conflicts:
platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -07:00
4e3e3653a3
[Frontend] Styling for search elements
...
#70
Significant .scss and markup changes across search;
New symbols font (v2.2) char for clear icon;
To-do: style "load more" element;
2015-08-18 19:51:47 -07:00
d3ea67fbd9
[Search] Templates vs representations
...
Made the search and search-menu templates into
representations, to be more consistent.
2015-08-18 16:54:36 -07:00
89cb6867bd
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-08-11 14:32:39 -07:00
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
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
a77920bd18
[Code Style] Use prototypes in Browse bundle
...
WTD-1482.
2015-08-10 11:52:23 -07:00
31eb366e7f
[JSDoc] Add namespace docs
...
WTD-1482.
2015-08-07 12:13:15 -07:00
eaaa1a19ca
[JSDoc] Remove obsolete module references
...
WTD-1482
2015-08-07 11:55:38 -07:00
c08a460d30
[JSDoc] Add annotations
...
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
48a9eef924
Merge branch 'open-master' into open-965
2015-08-06 16:13:37 -07:00
c80e9bfa26
[Style] JSLint Compliance
2015-08-06 15:21:28 -07:00
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
19b80ded16
Merge remote-tracking branch 'origin/open1423' into open-965
2015-08-06 15:10:52 -07:00
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
63a99f26f6
Merge branch 'mobile_3' into mobile
2015-08-06 14:13:13 -07:00
7ca15a9de2
[Mobile] Representation
...
Edited grid item to center
shared button.
2015-08-06 14:11:59 -07:00
0bc4f2dc6e
Merge remote-tracking branch 'upstream/master' into mobile
2015-08-06 13:45:37 -07:00
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
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
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
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
2d1aa65d63
[Mobile] Test
...
BrowseController test adjusted to
repeat less code.
2015-07-30 12:50:39 -07:00
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
bdf8b4d3f1
[Mobile] Test for Back Arrow
...
Added tests for the backarrow and
when it appears/disappears.
2015-07-29 13:22:47 -07:00
97bf530b1d
[Mobile] BackArrow
...
Removed the BackArrow console log
that was getting called in the
BrowseController.
2015-07-29 11:41:10 -07:00
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
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
356fa73c91
[Mobile] Tests
...
Test created for backArrow
that spies on all objects
used to find parent.
2015-07-28 15:55:22 -07:00
a073ef69ac
[Mobile] Back Arrow
...
Shifted Back Arrow down to
align with header.
2015-07-28 15:15:42 -07:00
3c6c420023
[Mobile] Back Arrow
...
Back Arrow implemented
by getting parent and then
navigating to it.
2015-07-28 15:08:14 -07:00
2a4943f584
[Mobile] Console
...
Removed call to console so
mvn clean install would compile.
2015-07-28 10:58:22 -07:00
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
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
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
6e43a92191
[Mobile] Merge
...
Fix Conflicts.
2015-07-27 15:21:59 -07:00
6b02295bf4
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-07-24 14:20:27 -07:00
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
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
7d495f6389
[Search] Hide tree
...
The tree is hidden when there are
search results.
2015-07-23 15:55:20 -07:00
d115166dde
[Mobile] Comments
...
Added comments and removed
unwanted spec test code for
BrowseController.
2015-07-23 13:48:21 -07:00
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
c65a278fcf
[Search] Selecting results works
...
Can now click on search results. The view will
be updated, as well as the selected object
being higlighted.
2015-07-23 10:50:00 -07:00
b16af5fe3e
[Search] Renaming search and searchbar
...
Changed what was previously just 'search' and
renamed to 'search view'. Then, took what was
previously 'searchbar' and renamed to
'search'.
2015-07-22 15:43:28 -07:00
