ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 06:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,081 Commits 989 Branches 212 Tags 191 MiB
9f137513d9
Commit Graph

1081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hacskaylo
9f137513d9 Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341 2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
Re-rendered css file;
 2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:52:52 -07:00
Victor Woeltjen
889ca79c5e Merge pull request #21 from shivamndave/open16 
Addresses #16
 2015-06-24 16:30:09 -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
c827c40c03 [Windowing] used 
Used  instead of window in the
NewTabAction. WTD 16.
 2015-06-24 12:58:48 -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
8926d4b2fb Merge remote-tracking branch 'upstream/master' into open16 2015-06-24 11:34:33 -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
Victor Woeltjen
47647f4ada Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-24 10:06:10 -07:00
Victor Woeltjen
1dbd6fc868 Merge pull request #20 from nasa/open14 
[Frontend] Fix to prevent infobubbles from preventing clicks
 2015-06-24 10:05:16 -07:00
Sanderfer
f617a01a4d Ticket WTD-1315 
Merge branch 'open-master' into open475
 2015-06-24 09:56:08 -07:00
Shivam Dave
83cc0b65d5 [Windowing] Comments 
Added comments to files. WTD-16.
 2015-06-23 16:35:34 -07:00
Shivam Dave
61d9545414 [Windowing] UrlService 
UrlService added which takes in a
mode (browse or edit), and also a
domainObject. Returns the url
path to that domainObject. WTD-16.
 2015-06-23 16:11:06 -07:00
Shivam Dave
21462bf60d [Windowing] View Set 
Sets the view to bethe current
page's view mode. WTD-16.
 2015-06-23 15:39:48 -07:00
Shivam Dave
29efb5cf3b [Windowing] Selected Object 
Uses the context to get the selected object
or the navigated object. This allows contextual
menu new tab access from the tree. WTD-16.
 2015-06-23 13:32:09 -07:00
Shivam Dave
e55cd88d38 [Windowing] View 
Includes the view using the
.search().view to find
the view key and append that to the
end of the url. Prints this out using
the alert window. WTD-16.
 2015-06-23 11:38:01 -07:00
Shivam Dave
e38ad7b082 [Windowing] Path Alert 
Alerts user of the current path
using an alert window, however
the path is partially shown.
It is the part of the current
path after index.html#. WTD-16.
 2015-06-23 11:05:00 -07:00
Shivam Dave
d5a9019493 [Windowing] Comment Adjusted 
Changed window to tab in comments in
file. WTF-16.
 2015-06-22 15:54:32 -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
Shivam Dave
fd1c847e2c [Windowing] Remove Varibale 
Removed the variable currentUrl because it
was not needed. WTD-16.
 2015-06-22 15:06:12 -07:00
Shivam Dave
546af71263 Merge remote-tracking branch 'upstream/master' into open16 2015-06-22 14:06:40 -07:00
Shivam Dave
683a733ae1 [Windowing] SASS Edit 
Adjusted the SASS file to
not hide the new window button. Also
removed the overwrite metadata function
that was used to temprarily allow us to
view the new window button. WTD-16.
 2015-06-22 14:00:25 -07:00
Shivam Dave
bd6dc758fa Merge remote-tracking branch 'upstream/master' into open16 2015-06-22 13:22:42 -07:00
Shivam Dave
140e3a1fb6 [Windowing] Comments 
Added comments to the perform function
WTD-16.
 2015-06-22 13:20:57 -07:00
Shivam Dave
6b2edc4469 [Windowing] Opens Url 
Instead of displaying a dialog of
the url, the url is opened in a new
tab using the new window button.
WTD-16.
 2015-06-22 13:18:00 -07:00
Shivam Dave
8d9d8d4900 [Windowing] Display URL 
Alert box when pressing new tab button
displays the current url, that will be
opened in the new tab. WTD-16
 2015-06-22 13:14:39 -07:00
Shivam Dave
2fbfcc1333 [Windowing] Added new window button 
Currently overwrites metadata
similar to the FullScreenAction in order
to temporarily display the new window button
until the css is modified to do so. WTD-16
 2015-06-22 13:12:13 -07:00
Charles Hacskaylo
273ce42c16 [Frontend] Fix to prevent infobubbles from preventing clicks 
Added CSS class "bubble-container" to BUBBLE_TEMPLATE;
bubble-container utilizes CSS "pointer-events: none";
Changed INFO_HOVER_DELAY constant from 500ms to 2000ms;
 2015-06-22 12:53:53 -07:00
Sanderfer
7493f76d06 Merge branch 'open-master' into open1313 2015-06-22 10:11:00 -07:00
Victor Woeltjen
5ca954deaf [Plot] Test fallback on webglcontextlost 
Add test case to verify that fallback occurs when a
WebGL context is lost, WTD-475.
 2015-06-19 16:14:49 -07:00
Victor Woeltjen
a82fea2166 Merge pull request #5 from nasa/open1202 
[Plot] Improve plotting performance
 2015-06-19 16:05:18 -07:00
Victor Woeltjen
6b0a77d131 Merge pull request #8 from nasa/open1149 
[Addressability] Use/populate URL
 2015-06-19 16:05:10 -07:00
Victor Woeltjen
149ac44e8c Merge pull request #13 from nasa/open12 
[Execution] Add worker service
 2015-06-19 16:05:02 -07:00
Victor Woeltjen
b6fdf4d6ab [Plot] Fall back from WebGL on context loss 
When a WebGL context is loss, fall back to displaying
plots using regular canvas 2d API. WTD-475.
 2015-06-19 16:02:52 -07:00
Victor Woeltjen
dac44623ee [Plot] Begin adding WebGL fallback 
Begin adding code to handle case where WebGL context
is lost, WTD-475.
 2015-06-19 15:47:22 -07:00
Victor Woeltjen
737cf2b75b Merge pull request #7 from nasa/open1272 
[Forms] Change format for date-time
 2015-06-19 15:47:10 -07:00
Shivam Dave
6a35476872 Merge branch 'open1149' of https://github.com/nasa/openmctweb into open1149 2015-06-19 13:55:23 -07:00
Victor Woeltjen
67d1201214 Merge branch 'open-master' into open1272 
Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js
 2015-06-19 13:16:33 -07:00
Victor Woeltjen
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
Victor Woeltjen
dbd7a65a7a Merge remote-tracking branch 'nasa/open1295' into open-master 2015-06-18 18:33:09 -07:00
Victor Woeltjen
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
Victor Woeltjen
3512018e90 Merge pull request #15 from shivamndave/issue11 
Addresses #11
 2015-06-18 15:58:24 -07:00
Shivam Dave
0292f046da [Browse Composition] Removed Window Alert 
Removed commented out code that
alerts the user if they cannot
perform a drag and drop. Inserted a
comment marking where an alert can be placed
Issue 11.
 2015-06-18 15:23:51 -07:00