slhale
ce433a01b2
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-07-28 17:04:44 -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
Victor Woeltjen
2ffe1cdff9
[Build] Bump version number
...
Bump version number, add snapshot status to begin sprint
Triton, WTD-824.
2015-07-28 13:30:39 -07:00
Victor Woeltjen
6596ddcb8c
[Build] Remove snapshot status
...
Remove snapshot status to close sprint titan,
WTD-824.
2015-07-28 13:23:57 -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
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
f7c0cb6214
Merge branch 'search' of https://github.com/nasa/openmctweb into search
2015-07-28 09:51:17 -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
Pete Richards
d569b13101
[Continuous] Deploy to staging-un
2015-07-28 09:40:16 -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
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
Pete Richards
e639d9ba8f
[Continuous] Only deploy from master branch
2015-07-24 17:32:49 -07:00
Pete Richards
c6b0e4bf6f
[Continuous] Set author after repo is initialized
2015-07-24 17:13:19 -07:00
larkin
60cdc0eb6d
[Licensing] Add license header to applicable files
2015-07-24 17:08:29 -07:00
larkin
36ac5aa4de
[Style] JSLint compliance
2015-07-24 17:07:53 -07:00
Pete Richards
09519cf6d4
[Continuous] Set commit author, fix grammar
2015-07-24 17:07:49 -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
larkin
44ee21d613
[Continuous] Push docs to correct repository
2015-07-24 16:41:10 -07:00
larkin
ee34b74ca1
[Style] Test config is JSLint approved
2015-07-24 16:21:15 -07:00
larkin
3fe9170c7d
[Gitignore] Ignore jsdoc output
2015-07-24 15:34:26 -07:00
shale
dca0014862
[Search] Removed unused
...
Removed incorrect 'uses' statements from
bundle.json. Also removed unused controller
ToggleController. Edited some comments.
2015-07-24 15:08:43 -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
05c43db6fe
[Search] Search input using the model
...
Made the search bar text input go to ngModel.input,
rather than getting the text manually from the DOM
element. Additionally, removed the search service
from the search controller's scope.
2015-07-24 13:04:48 -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
shale
300280e03e
[Search] Moving responsibility
...
Moving the responsibility of polling for updates
from the search controller to the search aggregator.
In progress. Previously this prototype was what
could be called semi-stable, but now it is no longer.
2015-07-23 16:58:25 -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
33e8084852
[Search] Getting input text
...
The controller now gets the input text from the
DOM element ID, then passes that string along
to the search service, instead of passing the
raw ID.
2015-07-23 16:13:26 -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
f4d34a2a9c
[Search] mctControl for searchbar
...
Attempting to generalize the searchbar using
mct-control. In progress.
2015-07-23 15:29:19 -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
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
shale
7b271dcb6b
[Search] Highlight transitions
...
Added transitions for when objects get
highlighted from selection or hover.
2015-07-23 13:14:20 -07:00
shale
2680e466fa
[Search] Tree selection syncs
...
Selecting something in the search results now
also makes it selected in the filetree. It
remains selected even when the search results
are cleared. (The filetree does not
automatically expand to that position though.)
2015-07-23 12:47:21 -07:00
shale
29d5535e7c
[Search] Changed search load time
...
Changed how frequently the search controller
checks for updates. This makes the load icon
dissapear faster, and looks more natural. But,
may affect performance.
Also changed the point at which the loading
status becomes 'true'. Made it earlier, at
the beginning of the controller's update().
2015-07-23 11:48:19 -07:00
shale
ebb5474b34
[Search] Hover and loading
...
Added styling to result items when they are
hovered over.
Also added a loading icon.
2015-07-23 11:41:17 -07:00
shale
4759162bb7
[Search] Added right padding
...
Added padding to the right side of the
search holder to match the tree holder's
padding.
2015-07-23 11:08:31 -07:00
shale
deba184103
[Search] Selection remains across queries
...
The selected object in the search results now
remains selected even after a new search is made.
It also will remain selected if it is clicked
on the file tree, but the file tree version is
not yet selected if it is clicked on the search
results list.
2015-07-23 10:56:38 -07:00
shale
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
