Commit Graph

387 Commits

Author SHA1 Message Date
c827c40c03 [Windowing] used
Used  instead of window in the
NewTabAction. WTD 16.
2015-06-24 12:58:48 -07:00
c606055a3b [Windowing] Format
Slight formatting change.
WTD 16.
2015-06-24 12:54:49 -07:00
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
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
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
83cc0b65d5 [Windowing] Comments
Added comments to files. WTD-16.
2015-06-23 16:35:34 -07:00
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
21462bf60d [Windowing] View Set
Sets the view to bethe current
page's view mode. WTD-16.
2015-06-23 15:39:48 -07:00
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
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
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
d5a9019493 [Windowing] Comment Adjusted
Changed window to tab in comments in
file. WTF-16.
2015-06-22 15:54:32 -07:00
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
c7154447e2 [Windowing] Tabbing Rename
Renamed all instances of NewWindow to be
NewTab instead. WTD-16.
2015-06-22 15:35:08 -07:00
dc4436e890 [Windowing] Unit Test Adjustment
Added comments to the NewWindowActionSpec.js
file. WTD-16.
2015-06-22 15:15:46 -07:00
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
fd1c847e2c [Windowing] Remove Varibale
Removed the variable currentUrl because it
was not needed. WTD-16.
2015-06-22 15:06:12 -07:00
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
bd6dc758fa Merge remote-tracking branch 'upstream/master' into open16 2015-06-22 13:22:42 -07:00
140e3a1fb6 [Windowing] Comments
Added comments to the perform function
WTD-16.
2015-06-22 13:20:57 -07:00
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
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
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
6b0a77d131 Merge pull request #8 from nasa/open1149
[Addressability] Use/populate URL
2015-06-19 16:05:10 -07:00
149ac44e8c Merge pull request #13 from nasa/open12
[Execution] Add worker service
2015-06-19 16:05:02 -07:00
6a35476872 Merge branch 'open1149' of https://github.com/nasa/openmctweb into open1149 2015-06-19 13:55:23 -07:00
dbd7a65a7a Merge remote-tracking branch 'nasa/open1295' into open-master 2015-06-18 18:33:09 -07:00
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
dc85d3c191 Merge pull request #4 from nasa/open884
[Info Bubble] Add info bubble
2015-06-17 11:47:34 -07:00
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
ee69eb3a01 [Addressability] Fix code style
Change code style to satisfy JSLint for changes from WTD-1149.
2015-06-16 16:10:31 -07:00
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
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
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
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
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
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
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
26fd56a003 [Addressability] Handle bad paths
Handle paths that cannot be completely followed, WTD-1149.
2015-06-16 14:35:15 -07:00
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
c428df524c Merging in open1248, resolve conflicts 2015-06-16 14:07:53 -07:00
4887ba0e58 Merge in open-master, resolve conflicts 2015-06-16 13:53:00 -07:00
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
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
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
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
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
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
a984e60ca5 [Frontend] Mods to layout element editing handles
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00
d614d7ee86 [Frontend] Very minor tweaks to bring open into parity with lastest scss from ue-frontend
WTD-1292
Tweaks prior to rebuild of ue-frontend branch;
2015-06-15 17:43:52 -07:00