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
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
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
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
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
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
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
Victor Woeltjen
640a399278
[Workers] Add example worker
...
Add an example worker which inefficiently calculates
fibonacci numbers outside of the UI thread, for #12 .
2015-06-18 11:21:00 -07:00
Victor Woeltjen
7d911a3fe0
[Workers] Add worker service
...
Add service for running WebWorkers, #12 .
2015-06-18 10:59:10 -07:00
Shivam Dave
a8488a92d9
[Gestures] Browse/Edit Composition
...
Disallows drag and drop during browse mode,
unless dragging and dropping into a folder
view. Allows drag and drop into a layout view
only in edit mode also. Can be unit tested now.
WTD-11.
2015-06-18 10:54:51 -07:00
Victor Woeltjen
dc85d3c191
Merge pull request #4 from nasa/open884
...
[Info Bubble] Add info bubble
2015-06-17 11:47:34 -07:00
Charles Hacskaylo
2677dcd10c
Merge branch 'open-master' into open1295
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
platform/commonUI/general/res/sass/_main.scss
2015-06-17 11:00:53 -07:00
Victor Woeltjen
ee69eb3a01
[Addressability] Fix code style
...
Change code style to satisfy JSLint for changes from WTD-1149.
2015-06-16 16:10:31 -07:00
Victor Woeltjen
5849f8afe2
[Addressability] Add spec for BrowseObjectController
...
Add spec for BrowseObjectController, added to track current
view selection from/to query string params, WTD-1149.
2015-06-16 16:09:22 -07:00
Victor Woeltjen
c1c633db80
[Addressability] Add test cases
...
Add test cases to BrowseController which reflect changes for
addressability, WTD-1149.
2015-06-16 15:57:08 -07:00
Victor Woeltjen
bcb4e9c495
[Addressability] Remove excessive check
...
Remove unneeded check from ViewSwitcherController; not necessary
to avoid overwriting query string selection of view. WTD-1149.
2015-06-16 15:40:19 -07:00
Victor Woeltjen
699cd3bd90
[Addressability] Update spec for BrowseController
...
Update spec to reflect changes for BrowseController to support
addressability of domain objects, WTD-1149.
2015-06-16 15:35:40 -07:00
Victor Woeltjen
9942e24039
[Addressability] Work around reload again
...
Work around Angular's page refresh on URL change to avoid
unintended effects when chosen view changes (such as tree
collapse), WTD-1149.
2015-06-16 15:23:55 -07:00
Victor Woeltjen
d559dae1e2
[Addressability] Expose current view in query param
...
Expose the currently selected view as a query string parameter,
WTD-1149.
2015-06-16 15:09:42 -07:00
Victor Woeltjen
fec6f06849
[Addressability] Obey view query string param
...
Obey the query string parameter for a view, if present.
WTD-1149.
2015-06-16 14:58:03 -07:00
Victor Woeltjen
26fd56a003
[Addressability] Handle bad paths
...
Handle paths that cannot be completely followed, WTD-1149.
2015-06-16 14:35:15 -07:00
Victor Woeltjen
d7b79b6b69
[Addressability] Preserve nav. state on leaving Edit
...
Preserve navigation state when leaving Edit mode, in the context
of addressability changes. WTD-1149.
2015-06-16 14:29:22 -07:00
Charles Hacskaylo
c428df524c
Merging in open1248, resolve conflicts
2015-06-16 14:07:53 -07:00
Charles Hacskaylo
4887ba0e58
Merge in open-master, resolve conflicts
2015-06-16 13:53:00 -07:00
Victor Woeltjen
3738ea16d7
[Addressability] Update route without reinstantiating
...
Work around normal behavior of Angular when path changes;
instead of reinstantiating controller for Browse mode
when Browse-initiated path changes occur, act as if the
route hadn't changed (so that the URL updates but the
currently-displayed state, e.g. tree expansion, is
preserved.) WTD-1149.
2015-06-16 13:44:35 -07:00
Victor Woeltjen
084d6b6859
[Addressability] Update path on navigation
...
Update path in browse mode when navigation state changes.
WTD-1149.
2015-06-16 13:28:19 -07:00
Victor Woeltjen
9fae2db04a
[Addressability] Infer ROOT
...
Treat the path element for the root domain object as implicit, such
that it does not appear in the full URL. WTD-1149.
2015-06-16 13:16:55 -07:00
Victor Woeltjen
8f18d88705
[Addressability] Navigate down path from params
...
Traverse down the path from route parameters to initially navigate to a
domain object in Browse mode. WTD-1149.
2015-06-16 13:14:12 -07:00
Victor Woeltjen
f24db1561e
[Addressability] Get IDs from URL
...
Add a route parameter to Browse mode which includes domain
object identifiers. WTD-1149.
2015-06-16 13:00:03 -07:00
Charles Hacskaylo
70e1a8ad9e
[Frontend] Mods to layout element drag handles and editing behavior
...
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
2015-06-16 12:40:48 -07:00
Charles Hacskaylo
a984e60ca5
[Frontend] Mods to layout element editing handles
...
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00