Pete Richards
3a050cc5b8
[Style] space after operator
2015-08-24 09:03:31 -07:00
Charles Hacskaylo
039d692e4c
Forgot to add new .scss file
...
open #74
2015-08-21 15:10:19 -07:00
Charles Hacskaylo
ee608cc4a4
[Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
...
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
Shivam Dave
d0183d44c9
[Actions] Remove Action
...
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
2015-08-21 13:04:47 -07:00
Shivam Dave
a7cc06a28b
Merge remote-tracking branch 'upstream/master'
2015-08-21 09:08:00 -07:00
Charles Hacskaylo
da8eb334e3
[Mobile] Sanding of mobile styles continues, in progress
...
open #74
CSS and markup changes for split pane holders;
drop shadow added to tree area;
Tree item cleanups;
This or earlier commit broke treeview nav action;
TO-DO: fix treeview nav action to hide menu;
2015-08-20 18:36:44 -07:00
Charles Hacskaylo
67592def90
[Mobile] Sanding of mobile styles, in progress
...
open #74
CSS and markup changes for mobile,
particularly on grid-item;
Mod to behavior in tree for mobile nav:
leaf node grid-item click now navs to item;
Fixed info-button to work properly with mod to
infoButtonGesture.js;
2015-08-20 16:11:45 -07:00
Charles Hacskaylo
3484b315cf
[Mobile] Sanding of mobile styles, cherry-pick to master
...
open #74
CSS and markup changes for mobile
that are good for master now;
2015-08-20 16:09:35 -07:00
Charles Hacskaylo
b1e1e85bbd
Merging in latest openmctweb master
...
open74
Had to resolve conflicts
2015-08-20 10:36:41 -07:00
Charles Hacskaylo
249a9b2eb2
[Frontend] Better sorting indicators added to styles
...
JPL #48
Simplified styles to indicate sort by asc and desc in table th elements;
(cherry picked from commit 15a2416)
2015-08-19 18:17:15 -07:00
Charles Hacskaylo
02abbdf4fe
Resolving conflict in platform/.../theme-espresso.css
...
#75
Merged in master branch;
Re-rendered platform/.../theme-espresso.css;
2015-08-19 16:22:21 -07:00
Charles Hacskaylo
08d68f99a5
[Frontend] Fix word wrapping issues in hover bubble
...
#75
CSS modified to utilize word-break property;
2015-08-19 16:09:55 -07:00
Victor Woeltjen
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
Victor Woeltjen
a4a9acd2ea
Merge branch 'open-master' into open-965
...
Merge in latest into topic branch for WTD-965 to
resolve conflicts.
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-19 14:16:56 -07:00
Pete Richards
c118234bbf
[Style] Brace after if criteria
2015-08-19 13:55:02 -07:00
Pete Richards
a94763041e
[Move] correct logic and specification
2015-08-19 13:16:36 -07:00
Pete Richards
26892e7104
[Location] isLink/isOriginal are antonyms
...
Simplify implementation of isLink/isOriginal for better maintainability.
2015-08-19 11:49:45 -07:00
Pete Richards
5c74365f4b
[Root] Root model provider sets location
...
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
2015-08-19 11:49:03 -07:00
Pete Richards
94854e5965
[Location] can retrieve contextual location
...
Clarify naming of method for retrieving contextual location of a domain
object.
Default behavior for objects that do not have a context is to return
undefined. Note that default behavior is not specified and could change
if needed.
2015-08-19 11:33:45 -07:00
Pete Richards
9cf30f4213
[Location] setPrimaryLocation takes location.
...
Rename "persistLocation" to be more clearly named, and make it take an
argument to allow for greater control outside the capability.
2015-08-19 11:25:41 -07:00
Pete Richards
eb776e69c0
[JSDoc] Document LocationCapability constructor
2015-08-19 11:13:24 -07:00
Shivam Dave
c4dd4f5c45
[Mobile] Merge
...
Merged with master.
2015-08-19 11:01:58 -07:00
slhale
432ec519b6
Merge branch 'search' into open70
...
Conflicts:
platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -07:00
Charles Hacskaylo
7f65ba236c
[Frontend] Tweaks to Load More results button
...
#70
2015-08-19 09:44:23 -07:00
Charles Hacskaylo
3a86f5e746
[Frontend] Tweak to Load More button label
...
#70
2015-08-18 19:54:50 -07:00
Charles Hacskaylo
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
slhale
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
slhale
9ebc04ef14
[Search] Cleanup and documentation
2015-08-18 16:08:16 -07:00
Charles Hacskaylo
e426e0e5ec
Merging in latest from master
...
#70
2015-08-18 15:23:42 -07:00
slhale
3d1e1659c2
[Search] Update tests
...
for 100% coverage.
2015-08-18 12:37:47 -07:00
slhale
17f2bb966b
[Search] Update tests and remove redundancy
...
Updated the generic provider test. Removed index
checking from the generic search worker, because
that checking is already done (more efficiently)
in the generic search provider.
2015-08-18 12:27:04 -07:00
slhale
a98b65286f
[Search] Update tests
...
Updated the SearchController tests for more coverage,
due to additions to the controller. Fixed a small
logic error in controller.areMore()
2015-08-18 11:28:12 -07:00
slhale
17aa666519
[Search] Remove unnecsissary controller
...
Removed the SearchItemController, as the logic was simple
enough to be done in one line in the search item
representation html.
2015-08-18 10:19:20 -07:00
Victor Woeltjen
f6cf4c3215
[Code Style] Fix error in persistence
...
Fix typo in persistence provider for ElasticSearch related
to refactoring to use prototypes, WTD-1482.
2015-08-17 17:00:21 -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
Charles Hacskaylo
f4b87cf70d
[Project source] Updated icomoon.io symbols font project file
2015-08-17 15:47:28 -07:00
Charles Hacskaylo
366ec3d516
[Frontend] Styles for tabular views and view sections
...
Original issue: https://github.jpl.nasa.gov/MissionControl/vista/issues/30
New CSS and symbols to support tabular views;
Required by JPL branch vista30 (https://github.jpl.nasa.gov/MissionControl/vista/tree/vista30 )
2015-08-17 15:11:27 -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
slhale
3a932f5443
[Search] No searching root
...
Removed the root type from the search menu
types, so searches through the current UI
will not reutrn root objects.
2015-08-17 14:32:25 -07:00
slhale
ce58aff18a
[Search] Remove unused code
2015-08-17 14:31:43 -07:00
slhale
24ee8ec063
[Search] Remove old files
...
Remove old search view files from before
the left tree bar search.
2015-08-17 13:53:37 -07:00
slhale
eee8790682
[Search] Add tests
...
Added tests for SearchMenuController.
2015-08-17 13:46:28 -07:00
slhale
083932e902
[Search] Moved search menu to a template
...
Created a search-menu template and corresponding controller.
Moved functions out of SearchController to SearchMenuController.
The two controllers share information through ngModel.
2015-08-17 12:34:50 -07:00
Pete Richards
9ab06cfdd2
Merge remote-tracking branch 'github-open/open1506' into open-master
2015-08-17 11:48:23 -07:00
slhale
e159b7a15d
[Search] mct-control textfield breaks focus
...
Set up bundle.json so that the search bar could
be a mct-control, but left the control itself
commented out because then CSS styling would not
work due to lack of access to parent elements.
2015-08-17 11:47:40 -07:00
Victor Woeltjen
4481c44c4b
[Code Style] Refactor search to use prototypes
...
WTD-1482.
2015-08-17 11:20:23 -07:00
slhale
6d660d48ca
[Search] Change default search menu
...
The search menu now opens to having none of the types
checked, but 'ALL' checked. Checking anything besides
'ALL' unchecks 'ALL' and begins filtering search by
type.
2015-08-17 11:17:02 -07:00
Victor Woeltjen
bf417a14e0
Merge remote-tracking branch 'origin/open-master' into open1482c
...
Merge latest into topic branch for WTD-1482
2015-08-17 11:01:39 -07:00
Shivam Dave
0cee5ad380
Merge remote-tracking branch 'upstream/master'
2015-08-17 10:50:19 -07:00
Victor Woeltjen
83fce6ad77
[Search] Remove unused dependency
...
Remove unused dependency from generic search worker,
avoids WTD-1511.
2015-08-17 10:45:02 -07:00
slhale
7b4934ec55
[Search] Shorter menu transition
2015-08-17 10:33:26 -07:00
slhale
2ef0c2a8cb
[Search] Documentation
...
More specific descriptions of angular scope
variables in searchcontroller.
2015-08-17 10:33:10 -07:00
Victor Woeltjen
2ccca016a5
[Code Style] Use prototypes in telemetry bundle
...
WTD-1482
2015-08-14 16:55:17 -07:00
slhale
cb0f72052f
[Search] Update tests
...
Changed references to isLoading to
mockScope.loading
2015-08-14 16:46:22 -07:00
slhale
1030eff943
[Search] Documentation
2015-08-14 16:44:34 -07:00
slhale
5e3caf6252
[Search] Shorter menu transition
2015-08-14 16:35:14 -07:00
slhale
aa67489404
[Search] Remove unnecissary funtions
...
Removed isLoading, hasInput, and clear
functions in favor of having the logic
within the search template.
2015-08-14 16:33:23 -07:00
Victor Woeltjen
1ea6f7620e
[Code Style] Begin refactoring telemetry bundle
...
Begin refactoring telemetry bundle to use prototype
for methods, WTD-1482.
2015-08-14 16:14:15 -07:00
Victor Woeltjen
365134b085
[Code Style] Use prototypes in representation bundle
...
WTD-1482
2015-08-14 16:13:46 -07:00
Victor Woeltjen
07a2065c11
[Code Style] Use prototypes in policy bundle
...
WTD-1482.
2015-08-14 15:49:47 -07:00
Victor Woeltjen
f8cb3f464c
[Code Style] Use prototypes in persistence queue
...
WTD-1482
2015-08-14 15:43:37 -07:00
slhale
31337eaf4f
[Search] Text clear size & hover
...
The search bar clear button now gets
highlighted when hovered over, and the
click area is slightly larger.
2015-08-14 15:38:02 -07:00
Victor Woeltjen
3e8ea972c2
[Code Style] Use prototypes in persistence bundles
...
WTD-1482
2015-08-14 15:26:24 -07:00
slhale
0f6287e715
[Search] Fix overflow
...
Fixed the text positioning in the filter
options display so that the text does not
overflow the bottom.
2015-08-14 15:22:53 -07:00
slhale
0cfd881510
[Search] Menu transition and highlights
...
The search menu fades in and out when open
and closed. Hovering over 'ALL' in the
menu now highlights it.
2015-08-14 15:05:54 -07:00
Victor Woeltjen
edca2a9f03
[Code Style] Use prototypes in framework layer
...
WTD-1482
2015-08-14 14:50:48 -07:00
slhale
cc05c50769
[Search] Smaller checkbox size
...
in the search menu.
2015-08-14 14:11:26 -07:00
slhale
adbb3486c5
[Search] Added ClickAwayController test
...
Added a test for the click away controller. Because
the controller was copied from
platform/commonUI/general, so was the test.
2015-08-14 13:56:27 -07:00
slhale
ced1609e51
[Search] Update tests
...
Updated SearchController test for the addition of the
controller's dependency on types[].
2015-08-14 13:52:57 -07:00
Victor Woeltjen
7fe866060b
[Code Style] Use prototypes in forms bundle
...
WTD-1482.
2015-08-14 13:44:08 -07:00
slhale
7bc9b83aac
[Search] Remove unused watch
2015-08-14 13:35:49 -07:00
slhale
d6d16f8f1c
[Search] Font and spacing
...
Use em for filter options positioning. Cursor
as pointer for menu. Results list padding fix.
2015-08-14 11:58:32 -07:00
slhale
bcea3832ed
[Search] Search menu & display tweaks
...
Clicking on names of options in the search
menu will now toggle the checkboxes. The
filter options display now says when no
filters are selected. Slightly moved the
search menu to the left.
2015-08-14 11:06:40 -07:00
slhale
94662cb904
[Search] Search filter options display style
...
Created a box around the options display.
2015-08-14 10:52:03 -07:00
slhale
26ab9af911
[Search] Dynamic positioning and height
...
The scroll bar for the search results changes
height according to how many filter options
are displayed above it, without dissapearing
below the bottom of the page.
2015-08-14 10:19:13 -07:00
slhale
f38b89a582
[Search] style
2015-08-13 16:56:58 -07:00
slhale
c17ec19f97
[Search] Filter options display styling
2015-08-13 16:54:15 -07:00
slhale
2ca7a175bd
[Search] Relative positioning
...
Search results list now displays below the
filter options display dynamically.
2015-08-13 16:40:51 -07:00
slhale
371b690072
[Search] Fix filter display names
...
Changed form type keys to names
2015-08-13 16:23:13 -07:00
slhale
c62e73f863
[Search] Checkbox style
...
Changed the checkboxes to be not blue.
2015-08-13 16:06:10 -07:00
slhale
5726dd0e0c
[Search] Filter display
...
Added display below the search bar of what
search filters are currently active.
Not yet correctly aligned wrt search
results list.
2015-08-13 15:11:22 -07:00
Victor Woeltjen
1c187c3914
[Code Style] Begin refactoring forms bundle
...
WTD-1482
2015-08-13 14:44:27 -07:00
slhale
74cf4d73d5
[Search] Hover transitions
2015-08-13 14:22:07 -07:00
slhale
c8694f182a
[Search] Menu opening
...
Menu opens when icon is pressed. Closes when
cliked away from, but not when clicked on.
2015-08-13 13:59:56 -07:00
slhale
2e767c94c4
[Search] Update load-more, add check-all
...
Make the 'Load more' button work with the
new filtered results. Added 'ALL' to the top
of the search menu which allows the user to
toggle all of the filtering options easily.
2015-08-13 13:19:25 -07:00
Victor Woeltjen
6302eee17e
[Code Style] Use prototypes in Scrolling List bundle
...
WTD-1482.
2015-08-13 12:35:48 -07:00
Victor Woeltjen
820c15d74c
[Code Style] Use prototypes in Plot bundle
...
WTD-1482.
2015-08-13 12:12:15 -07:00
slhale
b26aa3cab7
[Search] Filter search
...
Filtering search using the search menu works.
Load more does not work with this yet.
2015-08-13 11:45:46 -07:00
slhale
c51856522c
[Search] Menu checkboxes and labels
...
Added checkboxes with styling to the menu. Set
up a types list for the menu.
2015-08-13 10:59:12 -07:00
Victor Woeltjen
aefad6fdd3
[Code Style] Continue refactor of Plot bundle
...
Continue refactoring Plot bundle to use prototypes,
WTD-1482
2015-08-13 10:26:04 -07:00
slhale
a9c85d5241
[Search] Search menu style
...
Added caret to top of menu.
2015-08-12 16:38:38 -07:00
slhale
edf52f32ad
[Search] Search menu
...
Creating a search menu which will allow for
more specific search options.
So far have started top-down with styling.
In progress.
2015-08-12 16:13:36 -07:00
Victor Woeltjen
18bc7d3637
[Code Style] Begin using prototypes in Plot bundle
...
WTD-1482
2015-08-12 14:49:03 -07:00
Victor Woeltjen
175490e1f7
[Code Style] Use prototypes in Web Page bundle
...
WTD-1482
2015-08-12 14:32:05 -07:00
Victor Woeltjen
3492cd3942
[Code Style] Fix bug introduced by refactor
...
Do some extra checking, since capabilities may have
properties which are note methods. WTD-1482.
2015-08-12 13:57:17 -07:00
Victor Woeltjen
ed53808556
[Code Style] Use prototypes in Layout bundle
...
WTD-1482
2015-08-12 13:45:48 -07:00
slhale
41ddb76385
[Search] Remove unnecissary line
2015-08-12 13:24:39 -07:00
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
515470fa6a
[Search] Timeout length & indexed check
...
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
2015-08-12 11:03:10 -07:00
slhale
cab675c8ca
[Search] Timeout length & indexed check
...
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
2015-08-12 10:57:37 -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
9dd520f17b
[Search] Break up item indexing
...
Use timeouts to make the generic search's item
indexing not block up the page.
Updated tests accordingly.
2015-08-12 10:06:27 -07:00
Victor Woeltjen
a9e2d48036
[Code Style] Use prototypes in Imagery bundle
...
WTD-1482
2015-08-12 09:57:05 -07:00
slhale
0520f1c70c
[Search] Update tests
...
Test creation of the generic search provider
provides mock timeout argument. Slight change to
tree indexing test due to use of useCapability
function.
2015-08-12 09:53:23 -07:00
slhale
3b62f1a979
[Search] Break up item indexing
...
Use timeouts to make the generic search's item
indexing not block up the page.
2015-08-12 09:42:21 -07:00
Victor Woeltjen
d701567b70
[Code Style] Use prototypes for Events bundle
...
WTD-1482
2015-08-11 16:01:16 -07:00
Victor Woeltjen
7911909c5f
[Code Style] Use prototypes for execution bundle
...
WTD-1482.
2015-08-11 15:02:52 -07:00
Victor Woeltjen
b93d752c88
[Code Style] Use prototypes in entanglement bundle
...
WTD-1482
2015-08-11 14:58:31 -07:00
Victor Woeltjen
5e4dcc1e35
[Code Style] Fix typo
...
Fix typo in JSDoc annotation, WTD-1482
2015-08-11 14:53:45 -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
48693df51f
[Search] Input checks
...
More checks to see if the input is empty
before doing search computations.
2015-08-11 13:52:23 -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
slhale
11a45e4db0
[Search] Input checks
...
More checks to see if the input is empty
before doing search computations.
2015-08-11 13:08:58 -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
b7765ff388
[Code Style] Use prototypes in platform
...
WTD-1482
2015-08-11 12:57:31 -07:00
Victor Woeltjen
f377c7cb71
[Code Style] Use prototypes in containment bundle
...
WTD-1482.
2015-08-11 11:01:13 -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
109d933945
[Search] Fix test file path
2015-08-11 10:42:10 -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
3a0ba4f5a6
[Framework] Allow prototype-style constructors
...
WTD-1482.
2015-08-10 12:31:44 -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
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
0b9b936368
[JSDoc] Add missing class doc
...
WTD-1482.
2015-08-07 13:35:07 -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
058a0d393d
[Compatibility] Store reference instead of binding
2015-08-06 16:55:15 -07:00
Pete Richards
b0a23590d4
Revert "[Build] Bump PhantomJS Version"
...
This reverts commit 62f335573a
.
2015-08-06 16:53:42 -07:00
Pete Richards
48a9eef924
Merge branch 'open-master' into open-965
2015-08-06 16:13:37 -07:00
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
slhale
1d2cd4745c
[Search] Update tests
...
Updated generic provider test for more general
mock capability object.
2015-08-06 15:01:45 -07:00
slhale
ee2d7efae2
[Search] Index checks for changes
...
When indexing items initially, the generic
provider listens for mutations in case an
item's composition changes, so it can then
index the new children.
2015-08-06 15:01:17 -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
slhale
7cad3ba0bc
[Search] Update tests
...
Updated generic provider test for more general
mock capability object.
2015-08-06 14:52:54 -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
slhale
168a805e8e
[Search] Index checks for changes
...
When indexing items initially, the generic
provider listens for mutations in case an
item's composition changes, so it can then
index the new children.
2015-08-06 14:41:47 -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
6802484ad8
Merge remote-tracking branch 'upstream/master'
2015-08-06 13:45:24 -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
slhale
e0a0d293fa
[Search] Update test
...
Fully calls through the controller's search().
2015-08-06 10:35:57 -07:00
slhale
1a4d7618c1
[Search] Infinite cycle check
...
in indexItems in the generic provider.
2015-08-06 10:33:17 -07:00
slhale
a2eabc1b08
[Search] Infinite cycle check
...
in indexItems in the generic provider.
2015-08-06 10:25:02 -07:00
slhale
f76f6548a5
[Search] Type checking
...
Added type checking for arrays to indexItems.
2015-08-06 10:13:32 -07:00
slhale
44dce05ec5
[Search] Correct test file paths
2015-08-06 10:12:44 -07:00
slhale
e729a966c7
[Search] Type checking
...
Added type checking for arrays to indexItems.
2015-08-06 10:12:34 -07:00
slhale
836c508698
[Search] Style compliance
2015-08-06 09:55:08 -07:00
slhale
1fe492cc3d
[Search] New item indexer
...
This one (hopefully) doesn't fill up the
call stack when there are lots of items.
2015-08-06 09:51:09 -07:00
slhale
8923f23f70
[Search] New item indexer
...
This one (hopefully) doesn't fill up the
call stack when there are lots of items.
2015-08-06 09:49:29 -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
7c17581659
Merge remote-tracking branch 'origin/mobile_3' into mobile
...
Merged fixes regarding circleci check failure
2015-08-05 12:27:20 -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
slhale
ae763d000c
[Search] Remove ES provider from bundle
...
Removed the ElasticSearch search provider from its
bundle definition, but left its file in.
2015-08-05 12:23:40 -07:00
Shivam Dave
a146185bd2
Merge remote-tracking branch 'origin/mobile_3' into mobile
2015-08-05 12:17:49 -07:00
Shivam Dave
0b635afcf7
[Mobile] Tests
...
ContextMenu and InfoButton Gesture
tests remain.
2015-08-05 12:14:16 -07:00
slhale
6407a66d30
[Search] Worker test correction
...
Removed unused parameter. Made path to worker
not relative.
2015-08-05 10:26:16 -07:00
slhale
6a0bd10d5b
[Search] Worker test correction
...
Removed unused parameter. Made path to worker
not relative.
2015-08-05 10:18:10 -07:00
Shivam Dave
f46a0853b9
[Mobile] Tests
...
Removed mockMenu from ContextMenuGestureSpec.
2015-08-04 16:58:37 -07:00
Shivam Dave
7f486f739d
Merge remote-tracking branch 'upstream/master'
2015-08-04 16:54:14 -07:00
Shivam Dave
66c81ce3d6
Merge remote-tracking branch 'upstream/master' into mobile
2015-08-04 16:53:45 -07:00
slhale
5fa6db72d2
[Search] More controller tweaking
2015-08-04 16:50:50 -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
slhale
e43e14ec00
[Search] Remove unused dependency
...
Removed the generic search worker's dependency on
the object service, which it does not use.
2015-08-04 16:45:23 -07:00
slhale
c9acfc9f89
[Search] Tweak controller loading
...
Changed the controller to update the tree
display status when the search result
promise is fufilled, not before making the
search query.
Also chagned the loading increment from
5 to 20.
2015-08-04 16:40:31 -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
slhale
d23f4de36a
[Search] Cleanup
...
Variable names, and unused parameters.
2015-08-04 13:16:29 -07:00
slhale
d82be0deef
[Search] Remove unused parameter
2015-08-04 13:14:20 -07:00
slhale
eab140df48
[Search] Generic search roots constant
...
Made a constant for the generic search roots,
rather than depending on roots[].
2015-08-04 13:10:29 -07:00
slhale
15e39e00c2
[Search] Search aggregator return type
...
The search service returns objects containing
searchResult objects.
2015-08-04 13:07:47 -07:00
slhale
077a0ce3e3
[Search] Changed array to dictionary
...
for faster lookup times in the search aggregator's
filterDuplicated function.
2015-08-04 13:06:04 -07:00
slhale
5711b2b241
[Search] Fixed file paths
2015-08-04 13:04:52 -07:00
slhale
d9a1b9d530
[Search] Moving files
...
Moved the elasticsearch provider to
platform/persistence/elastic. Then moved
the search aggregator and the generic
provider into a services folder within
the search folder.
2015-08-04 13:03:34 -07:00
slhale
b6c1eadb91
[Search] Generic search roots constant
...
Made a constant for the generic search roots,
rather than depending on roots[].
2015-08-04 11:48:28 -07:00
slhale
56265c2277
[Search] Search aggregator return type
...
The search service returns objects containing
searchResult objects.
2015-08-04 11:39:09 -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
slhale
bbce5c3154
[Search] Changed array to dictionary
...
for faster lookup times in the search aggregator's
filterDuplicated function.
2015-08-04 11:19:34 -07:00
slhale
c869aaf91a
[Search] Fix file paths
2015-08-04 11:10:49 -07:00
slhale
5b0bf0a0ba
[Search] Moving files
...
Moved the elasticsearch provider to
platform/persistence/elastic. Then moved
the generic provider out of its folder.
2015-08-04 11:05:32 -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
slhale
45bedb20c1
[Search] Comments and style
2015-08-04 10:01:54 -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
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
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
slhale
e928e02b1c
[Search] Update tests
...
Updated the search controller test to work with
the changes to loadMore
2015-08-03 11:48:50 -07:00
slhale
1cd6685b36
[Search] Update loadMore
...
The controller's loadMore function now sends
new queries to the search service if the
controller's full results list does not have
enough results in it to load more.
2015-08-03 11:44:56 -07:00
slhale
695582b30f
[Search] Clean up
2015-08-03 11:38:47 -07:00
slhale
d0bad46627
[Search] Style
...
Removed use of the keyword 'catch' when dealing
with promises, and instead used the second
parameter of then.
2015-08-03 10:46:34 -07:00
slhale
eb0bdba666
[Search] Moved isLoading
...
Moved the isLoading function away from
the aggregator. It is now the controller's
responsibility. Corresponding tests
updated.
2015-08-03 10:45:30 -07:00
slhale
19b9668190
[Search] Restoring web worker tests
2015-08-03 10:21:50 -07:00
slhale
59d4c362f6
[Search] Temporarily remove web worker test
2015-08-03 10:13:00 -07:00
slhale
9be646f1e7
[Search] Moved search folder location
...
Moved search from platform/features/search to
platform/search. Added more style corrections.
2015-08-03 09:51:36 -07:00
slhale
164d5485e9
[Search] Wrote provider test
...
Completed tests for GenericSearchProvider.
Also fixed style in other tests.
2015-08-03 09:36:13 -07:00
slhale
7678289ead
[Search] Wrote worker test
...
Completed tests for GenericSearchWorker.
2015-07-31 16:37:11 -07:00
slhale
2a62494296
[Search] Wrote provider test
...
Completed tests for ElasticsearchSearchProvider.
2015-07-31 15:27:02 -07:00
slhale
ae94ba73d7
[Search] Wrote aggregator test
...
Completed tests for SearchAggregator.
2015-07-31 11:33:58 -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
slhale
5b3f78287e
[Search] Wrote controller tests
...
Completed tests for SearchController and
SearchItemController.
2015-07-31 10:40:16 -07:00
slhale
4bb000dd93
[Search] Writing tests
...
Created files for all the tests to write.
2015-07-31 09:38:45 -07:00
slhale
06d9b68406
[Search] Comments
2015-07-31 09:38:05 -07:00
slhale
3a3e98cc48
[Search] Update provider timeout
...
Added a timedOut property to the provider's
return object. Changed the generic search
worker to stop if it reaches timeout.
2015-07-30 16:35:26 -07:00
slhale
6e11941ae9
[Search] ES Provider error checks
...
The elasticsearch provider returns an empty
result when elasticsearch throws an error
(probably a bad request). This prevents the
aggregator from thinking that ES is loading
infinitely.
2015-07-30 15:47:09 -07:00
slhale
f8471bc944
[Search] Comments
2015-07-30 15:04:42 -07:00
slhale
15b7e3ac9b
[Search] Aggregator returns result object
...
The aggregator now returns a result object similar
to that of the providers, but the hits array contains
domain objects rather than searchResult objects.
Also removed overly complicated filterRepeats
function from the aggregator and replaced it with a
simpler one.
2015-07-30 14:57:15 -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
slhale
51bc7c6a7f
[Search] Generic tracks total hits
...
The generic search worker keeps track of the total
number of search hits before truncating to match
the max results.
2015-07-30 14:06:35 -07:00
slhale
60dad014cc
[Search] Changed provider return type
...
The provider now returns an object that has
a hits property which contains what it
previously returned, and also a total property
which contains the total number of results.
2015-07-30 13:54:56 -07:00
Shivam Dave
85658d3d1f
[Mobile] Tests
...
Removed tests causing incomplete
build.
2015-07-30 13:33:59 -07:00
slhale
a7cd6d8807
[Search] Removed name field form ES provider
...
Removed the name field from the ElasticSearch provider
search query string, so now it will check all of the
fields of the domain object (such as type).
2015-07-30 13:32:34 -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
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
slhale
bce56c53ed
[Search] Clean up
...
Updated comments and documentation. Changed the generic
worker to return results as {id: score} key value pairs
rather than {id: {score: score}} format. Removed unused
getLatestResults and getLatestTimestamps functions from
the providers.
2015-07-30 13:27:45 -07:00
Shivam Dave
2d1aa65d63
[Mobile] Test
...
BrowseController test adjusted to
repeat less code.
2015-07-30 12:50:39 -07:00
slhale
2c5da44e5e
[Search] Clean up
...
Removed the timestamp as an optional parameter
of the search aggregator's query(), and now it
instead automattically generates one before
querying the providers.
Also attempted to fix loading, but did not
complete (commented out).
2015-07-30 12:38:03 -07:00
Shivam Dave
c333a2e70a
[Mobile] Test
...
Repeat of test variable deleted.
2015-07-29 16:31:38 -07:00
slhale
6b613f234b
[Search] Clean up comments
2015-07-29 15:22:46 -07:00
slhale
1619f236cf
[Search] Updated search service interface
...
The search service's interface now just consists
of the two functions query() and isLoading().
query() returns a promise for an array or results,
which eliminates the need for timeout polling like
was previously done. The search providers
have also been changed to reutrn promises.
2015-07-29 15:07:13 -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
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
slhale
5ee8dd239b
[Search] Comments
2015-07-29 13:17:50 -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
slhale
f2cd55d6cd
[Search] Cleaning up
...
Cleaning up code in generic serach provider. Removed
unnecissary return statements. Moved indexing via web
worker from getItems() loop to within itemsHelper().
Commented out timeout, becuase seems unnecissary.
Changed all date.getTime() to Date.now(). Indexing
has undefined checking.
2015-07-29 11:01:38 -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
slhale
639cf1cf59
[Search] Generic indexes once
...
Changed the generic search provider to index the
file tree only once when it is initially called.
This assumes that the contents of the file tree
will not change significantly within the course
of a use session (and some changes may be caught
by other search providers).
2015-07-29 10:28:07 -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
slhale
495d8c9830
[Search] Search term processing
...
The search term processor for ElasticSearch now
removes extra spaces from inside of the search
term (to avoid some ES errors).
2015-07-28 17:04:29 -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
slhale
1a9dd2f144
[Search] Comments
...
Updated documentation. Removed unnecissary dependency
fom generic provider.
2015-07-28 11:33:29 -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
d6a7dc9820
Merge branch 'search' of https://github.com/slhale/openmctweb into search
2015-07-28 10:17:15 -07:00
slhale
dc53cf60d1
[Search] Style
...
Made style compliance changes.
2015-07-28 10:15:05 -07:00
slhale
e0e5ad1347
[Search] Removed console output
...
Accidentally left in a console.log statement
2015-07-28 10:04:31 -07:00
slhale
a6b11354cd
[Search] Removed console output
...
Accidentally left in a console.log statement
2015-07-28 10:03:22 -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
617df739ee
[Mobile] persistence
...
Removed elasticsearch.
2015-07-27 15:26:09 -07:00
Shivam Dave
6e43a92191
[Mobile] Merge
...
Fix Conflicts.
2015-07-27 15:21:59 -07:00
shale
84486f2086
[Search] Fixed empty search
...
Pressing enter on the searchbar before putting
any input would before hide the filtree when
it shouldn't. Now it does not.
2015-07-27 14:12:49 -07:00
shale
dc79f460e5
[Search] Fixing conflicts
2015-07-27 13:34:12 -07:00
shale
7cac858697
[Search] Cleanup
...
Updated documentation. Removed most unused funtions.
Removed references to the search service in the
search template -- necissary functions added to
the search controller.
(Search in a 'working' state again.)
2015-07-27 13:25:35 -07:00
shale
a3977a18f0
[Search] Results polling in aggregator
...
Moved the polling for most recent results
from the search controller to the search
aggregator.
Also changed ng-change back to ng-keyup
in the search template.
2015-07-27 12:59:32 -07:00
shale
5e858f73d5
[Search] Changed ng-keyup to ng-change
...
In the search template. Also small comment change.
2015-07-27 11:55:42 -07:00
Shivam Dave
a9418fd2c7
Merge remote-tracking branch 'upstream/master'
2015-07-27 11:32:41 -07:00
Shivam Dave
1d7a0fa48d
[Mobile] Removed InfoGesture
...
Commented out infogesture.
2015-07-27 11:30:29 -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
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
shale
181fb32a2a
[Search] Responsibility change (in progress)
...
Attempting to move some responsibility from
the search controller to the aggregator.
(Committing for save before possible revert.)
2015-07-27 10:04:09 -07:00
shale
232a648fbd
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-07-27 09:14:52 -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
shale
d35a149108
[Search] Remove unused controll
...
Removed searchbar controll, as the control to
use would be the provided textfield control.
2015-07-24 16:52:55 -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