ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 15:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,386 Commits 989 Branches 212 Tags 191 MiB
946a6d4a04
Commit Graph

70 Commits

Author SHA1 Message Date
Pete Richards
6ce4ce6ada Merge remote-tracking branch 'github-open/open139-1' into open-master 2015-09-23 13:51:55 -07:00
Pete Richards
70bc17c79f Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Victor Woeltjen
56ccf29cfe [Persistence] Include timestamp on creation 
Include a persisted timestamp when an object is first
created. nasa/openmctweb#139
 2015-09-22 11:32:18 -07:00
Victor Woeltjen
0c1f77cfab [Mobile] Collapse tree on click 
Collapse tree any time a user does an action in the
tree that would select an object; don't only do this
on navigation changes, because this fails to detect
occasions where user clicks the already-navigated-to
object.
 2015-09-21 10:53:45 -07:00
Victor Woeltjen
1e6c4732f1 [Mobile] Consolidate BrowseTreeController 
Make mobile variant of BrowseTreeController the regular version
of that controller; Browse mode has a dependency on mobile by
way of the mct-device directive anyway.
 2015-09-18 15:55:58 -07:00
Victor Woeltjen
884d36ad6d [Mobile] Test BrowseTreeController variants 2015-09-18 15:49:55 -07:00
Victor Woeltjen
24586ae378 [Mobile] Remove BackArrowController 
Remove BackArrowController; behavior can be implemented
in template.
 2015-09-18 15:29:55 -07:00
Victor Woeltjen
cf97b30084 [Mobile] Add empty specs 2015-09-18 15:21:23 -07:00
Victor Woeltjen
19500c2704 [Mobile] Restore browse controller from master 2015-09-17 17:42:38 -07:00
Victor Woeltjen
d981e7bb1d [Browse] Separate out back-arrow behavior 
Supports integration of changes for mobile, nasa/openmct#95
 2015-09-15 12:18:57 -07:00
Victor Woeltjen
a3a6706869 [Browse] Separate out back-arrow behavior 
Supports integration of changes for mobile, nasa/openmct#95
 2015-09-15 12:13:11 -07:00
Victor Woeltjen
72c122e0ee Merge remote-tracking branch 'github/master' into open95b 
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
 2015-09-15 11:35:25 -07:00
Victor Woeltjen
de6dfe1fdc Merge remote-tracking branch 'github/master' into mobile 
Merge in latest from master into mobile branch
to reconcile conflicts

Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
 2015-09-10 15:01:38 -07:00
Victor Woeltjen
426ab44d93 [Angular] Update Locator specs 
Update locator specs to provide expected functionality
of .
 2015-09-09 18:17:07 -07:00
Victor Woeltjen
b2649de649 [Composition] Update specs 
Update specs for changes to the return value of
composition.add, nasa/openmctweb#97
 2015-09-02 11:45:52 -07:00
Victor Woeltjen
8759fdbd95 [Composition] Update specs 
Update specs to reflect usage of the add method in
the composition capability.
 2015-09-02 09:37:26 -07:00
Shivam Dave
8a5c61e2e6 Merge remote-tracking branch 'upstream/master' into mobile 2015-09-01 14:50:45 -07:00
Victor Woeltjen
01f2fab70f [Create] Filter out control-less properties 
When properties have no control defined, don't show them
in the create dialog (but do show them in metadata, e.g.
info bubble.) For nasa/openmctweb#92
 2015-09-01 11:48:15 -07:00
Victor Woeltjen
b39753d0a6 [Entanglement] Separate out location 
Separate out location property from the CreationService,
instead handle in the entanglement bundle; this is
consistent with changes for identity management (attaching
a creator to newly-created domain object models).
for nasa/openmctweb#92
 2015-09-01 10:57:56 -07:00
Shivam Dave
67cb5f8077 [Mobile] Tests 
Completed test for the BrowseController
Spec that takes in an undefined context.
 2015-08-26 21:08:33 -07:00
Shivam Dave
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
Shivam Dave
cd46dab5c1 [Mobile] Merge 
Merged with master and resolved conflicts.
 2015-08-25 12:36:50 -07:00
Pete Richards
c80e9bfa26 [Style] JSLint Compliance 2015-08-06 15:21:28 -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
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
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
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
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
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -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
Sarah Hale
b2a23ee968 [Browse] Tests completed 
Completed the menu arrow controller test. All
tests are now completed. #33.
 2015-07-07 09:28:01 -07:00
Sarah Hale
2b67ae42bf [Browse] Gesture and action tests 
The menu gesture and the menu action tests
are completed. #33.
 2015-07-02 14:00:54 -07:00
Sarah Hale
db920a7b5c [Browse] Starting tests 
Created new test files for the additions. #33.
 2015-07-02 12:50:48 -07:00
Shivam Dave
2e716bdbe3 [Addressability} Unit Test 
Completed unit tests to accomodate
for url path check prior to setting
the current . WTD 23.
 2015-06-26 12:51:25 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Shivam Dave
fd6459394a [Windowing] urlService 
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
 2015-06-25 10:38:39 -07:00
Shivam Dave
93ba4ce715 [Windowing] Unit Test 
Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
 2015-06-25 10:10:13 -07:00
Shivam Dave
bd9010e2bc [urlService] CleanUp/Refactor 
Adjusted BrowseController's useRoute
to use the urlService instead. Also
adds urlService as a depency through
bundle. Unit test also adjusted to
account for a mockUrlService and
a different value being passed into
mockLocation.path(). WTD 16.
 2015-06-24 14:06:09 -07:00
Shivam Dave
c606055a3b [Windowing] Format 
Slight formatting change.
WTD 16.
 2015-06-24 12:54:49 -07:00
Shivam Dave
6863af9cd9 [Windowing] Comment/Formatting 
Reformatted code and added comments
to the unit test. Also refined the
NewTabActionSpec unit test to be
clearer. WTD 16.
 2015-06-24 12:50:21 -07:00
Shivam Dave
13eef59e4f [Windowing] Unit Test 
Added mockContext to
UrlServiceSpec unit test
in order to reach the
domainObject's context
capability. WTD 16.
 2015-06-24 12:31:40 -07:00
Shivam Dave
43cfab1031 [Windowing] Unit Test 
Unit Tests for UrlService and NewTabAction
created and partially written. UrlService
returns 100% and NewTabAction returns 88%.
WTD 16.
 2015-06-24 11:32:59 -07:00
Shivam Dave
1c445e1ce3 [Windowing] New Tab Adjustment 
Added NewTabAction to spec file and adjusted
it to new name. Also changed comment in
NewTabAction along with a code fix.
WTD-16.
 2015-06-22 15:44:09 -07:00
Shivam Dave
c7154447e2 [Windowing] Tabbing Rename 
Renamed all instances of NewWindow to be
NewTab instead. WTD-16.
 2015-06-22 15:35:08 -07:00
Shivam Dave
dc4436e890 [Windowing] Unit Test Adjustment 
Added comments to the NewWindowActionSpec.js
file. WTD-16.
 2015-06-22 15:15:46 -07:00
Shivam Dave
02265c82d6 [Windowing] Unit Test 
Completes Unit Test. Added a new file:
NewWindowActionSpec.js, which performs the
Jasmine test for NewWindowAction.js. The
test specifies a mockWindow with a mockUrl
and then adds both to a NewWindowAction.
Also suite.json contains the NewWindowActon
path. In order for NewWindowAction.jsWTD-16.
to be reached. WTD-16.
 2015-06-22 15:10:55 -07:00