Shivam Dave
a7cc06a28b
Merge remote-tracking branch 'upstream/master'
2015-08-21 09:08:00 -07:00
Victor Woeltjen
9c578c53db
Merge pull request #64 from nasa/open-965
...
[Location] track location of objects and distinguish links from originals
WTD-965
2015-08-19 14:28:00 -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
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
Pete Richards
9ab06cfdd2
Merge remote-tracking branch 'github-open/open1506' into open-master
2015-08-17 11:48:23 -07:00
Victor Woeltjen
4495c5b64a
[Build] Restore snapshot status
...
Bump version number and restore snapshot status to
begin sprint Umbriel, WTD-825.
2015-08-17 10:54:30 -07:00
Shivam Dave
0cee5ad380
Merge remote-tracking branch 'upstream/master'
2015-08-17 10:50:19 -07:00
Victor Woeltjen
f22c0a7ee4
[Search] Remove unused dependency
...
Remove unused dependency from generic search worker,
avoids WTD-1511.
2015-08-17 10:50:12 -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
Victor Woeltjen
8371b1b25b
Merge pull request #59 from slhale/searchservice
...
[Search] Created search service
2015-08-12 17:05:50 -07:00
slhale
94531a39d0
Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice
2015-08-12 13:17:17 -07:00
Victor Woeltjen
3db62edf59
Merge remote-tracking branch 'github/master' into open-master
...
Conflicts:
README.md
2015-08-12 12:19:53 -07:00
Victor Woeltjen
914c823675
[Tests] Comment out failing tests
...
Comment out tests which relate to object types not
yet in open source, WTD-1505
2015-08-12 11:57:56 -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
Victor Woeltjen
deb9e3e2ee
[Tests] Change Chrome binary env variable
...
Use CHROME_BIN as the environment variable for nonstandard
Google Chrome binary locations; this is the same variable
used by Karma, so configuration is simplified. WTD-1505.
2015-08-12 10:28:20 -07:00
Victor Woeltjen
b6b716b767
[Tests] Update protractor instructions
...
WTD-1505
2015-08-12 10:27:24 -07:00
Victor Woeltjen
7aea1647a2
[Tests] Ensure local storage is used
...
Ensure local storage is used for Protractor tests,
WTD-1505.
2015-08-12 10:24:49 -07:00
Jesse
b74cbf1969
Added Window/Unix Freindly String Compare functions
2015-08-12 10:24:49 -07:00
Jesse
eb10cbf87c
Cleaned Up Directory
2015-08-12 10:24:49 -07:00
Jesse
7918d7b287
Updated README and Renamed Tests
2015-08-12 10:24:49 -07:00
Jesse
fde0dc2a35
Added start.js Creates 'log' folder
2015-08-12 10:24:10 -07:00
Jesse
85f9d5a2da
Added Start Run Stop Scripts
2015-08-12 10:23:58 -07:00
Jesse
ef7c1bd025
Added Fix for Protractor Test
2015-08-12 10:23:50 -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
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
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
afddca510c
[Documentation] Fix markdown
...
Fix markdown typo in README.md
2015-08-07 13:47:32 -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
