Commit Graph

1325 Commits

Author SHA1 Message Date
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
Sarah Hale
7be7844824 [Events] Reversed viewing order
When viewing an event message generator new messages are now added to the
bottom of the display, rather than being added to the top and pushing
the other messages down by one. #18.
2015-06-22 13:40:55 -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
Sarah Hale
0feb3b0462 Merge branch 'open18' of https://github.com/slhale/openmctweb into open18 2015-06-22 12:37:15 -07:00
Sanderfer
7493f76d06 Merge branch 'open-master' into open1313 2015-06-22 10:11:00 -07:00
Victor Woeltjen
7f7759f72c Merge branch 'open-master' into open1223 2015-06-20 15:36:21 -07:00
Victor Woeltjen
8199d1d9d9 [Plot] Use mct-drag from plot
Use mct-drag from plot such that we are able to handle
mouse events which leave the plot area for marquee zoom
and pan. WTD-1273.
2015-06-20 11:47:10 -07:00
Victor Woeltjen
bc7342b127 [Plot] Make plot fixed duration a global default
WTD-1273.
2015-06-20 11:30:20 -07:00
Victor Woeltjen
f3cbcf0abe [Plot] Update ticks during pan
WTD-1273.
2015-06-20 11:21:55 -07:00
Victor Woeltjen
53f712b506 [Plot] Pan with alt-key
While alt is held, treat drag gestures in a plot area
as a pan, WTD-1273.
2015-06-20 11:19:56 -07:00
Victor Woeltjen
215d3ffd72 [Plot] Tweak fixed-duration code
Tweak fixed-duration code such that data is not
lost; WTD-1273.
2015-06-20 10:39:35 -07:00
Victor Woeltjen
fbf682d5fa [Plot] Support fixed duration
Support a fixed duration for plots, WTD-1273.
2015-06-20 10:28:49 -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
Charles Hacskaylo
ae7dae011b [Dev/Frontend] New example event generator and event view
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
2015-06-19 15:29:06 -07:00
Victor Woeltjen
4bc41e8aab Merge remote-tracking branch 'nasa/open1223' into open1223
Conflicts:
	platform/features/plot/res/templates/plot.html
2015-06-19 14:50:00 -07:00
Victor Woeltjen
71ca9803c2 [Core] Obey priority for capabilities
Obey priority for capabilities to allow this to be overridden
for other domain object types, WTD-1223.
2015-06-19 14:40:59 -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
3b62add011 Merge branch 'open-master' into open1223
Conflicts:
	platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -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
00229f01b1 [Plot] Test plot view policy
Test plot view policy, added in conjunction with image
telemetry; WTD-1170.
2015-06-18 17:11:11 -07:00
Victor Woeltjen
85e3101d08 [Plot] Expose plot view policy
Expose policy which suppresses image telemetry (and other
non-numeric telemetry) in plots. WTD-1170.
2015-06-18 17:00:20 -07:00
Victor Woeltjen
983a9a2f07 Merge remote-tracking branch 'nasa/open1170' into open1170 2015-06-18 16:58:44 -07:00
Victor Woeltjen
66b143c9d7 [Plot] Suppress plot for non-numeric telemetry
Avoids plot views becoming erroneously available for image
telemetry, WTD-1170.
2015-06-18 16:58:29 -07:00
Victor Woeltjen
51bd205502 [Imagery] Be flexible about format
Accept either image or imageUrl as format for image telemetry,
WTD-1170.
2015-06-18 16:53:52 -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
Charles Hacskaylo
0201a4bcf8 [Frontend] Fix to prevent infobubbles from preventing clicks
GitHub-12
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-18 15:18:42 -07:00
Victor Woeltjen
056c087953 [Representation] Add missing argument to spec
Add missing argument to spec for mct-representation, WTD-1256.
2015-06-18 15:09:17 -07:00
Shivam Dave
dab6d96688 [Browse composition] Not Alerting User
In this case the user is not alerted. This
is to test the maven build. Issue 11.
2015-06-18 15:08:13 -07:00
Sarah Hale
1f3c1da8c7 [Browse composition] Alert user
When the user attempts a disallowed drag and drop composition,
the browser will alert them to this. Issue 11.
2015-06-18 14:53:35 -07:00
Victor Woeltjen
275ca01692 [Representation] Trust template URLs
Trust resource URLs to skip SCE-checking (which profiling
flags as a performance problem) for mct-include and
mct-representation; these URLs are pulled from bundles and
not user-entered, so should be trusted. WTD-1256.
2015-06-18 14:43:14 -07:00
Sarah Hale
451842fb82 [Browse composition] Cleanup
Removed commented out code in tests. Issue 11.
2015-06-18 14:29:46 -07:00
Sarah Hale
9e52ddaee7 [Browse composition] Added and modified tests
Added additional tests to account for the different cases of
edit mode and folder vs non folder. Issue 11.
2015-06-18 14:26:54 -07:00
Victor Woeltjen
eb2cddc063 [Workers] Satisfy JSLint
Modify example worker script to satisfy JSLint. #12.
2015-06-18 11:30:47 -07:00