1c4cca3f91
Merge branch 'open1392b' into open-master
2015-06-29 16:30:48 -07:00
ef77ca91e7
Merge branch 'open1363' into open-master
2015-06-29 16:27:10 -07:00
970698c77b
Merge remote-tracking branch 'nasa/open1392' into open1392b
...
Conflicts:
platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
2015-06-29 16:09:01 -07:00
a0d5a1a196
[Common UI] Get split pane width from elements
...
WTD-1363.
2015-06-27 10:46:42 -07:00
a1eb15db77
[Common UI] Change min/max width handling in splitter
...
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
2015-06-27 10:35:49 -07:00
72c812cdaa
[Common UI] Enforce split pane min/max
...
WTD-1363.
2015-06-26 16:30:39 -07:00
39372ea9ca
[Common UI] Use mct-split-pane in Browse
...
WTD-1363.
2015-06-26 16:21:20 -07:00
0fd1fb709b
[Config] Fix for priority of New Tab button
...
WTD-1392
WTD-1359
Set "Open in new tab" button to have priority "preferred";
Set fullscreen mode button to priority "default";
Tweaked full screen button tooltip text;
2015-06-26 15:36:55 -07:00
d42abfef98
[Addressability] Comments
...
Added comments to the slight change in Browse
Controller and BrowseObjectController. WTD 25.
2015-06-26 12:58:16 -07:00
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
3de4473159
[Addressability] Re-Edit Bug
...
Fixed re-edit but by implementing
what Victor said in issue #25 . Adding
check on /browse/ part of url and then
changing route works WTD 23.
2015-06-26 11:52:03 -07:00
2a347f1596
[Windowing] urlService
...
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
2015-06-25 14:53:52 -07:00
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
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
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
ca6f44f7b6
[Windowing] URL Fix
...
The URL malformation was caused by the same
function returning the view and index path for
both the newtab window and the browse controller
window. As a result, the BrowseController now only
uses a path that excludes the view and index paths,
like before the UrlService was added. Another,
separate function uses this url for the location
and includes the view and index paths for new
tabs, in order to maintain the current view. WTD 23.
2015-06-25 09:47:58 -07:00
9ac6abe78f
Merge remote-tracking branch 'nasa/open980' into open1342
2015-06-25 09:07:27 -07:00
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
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
fdfa35d1da
[Frontend] New symbols font and CSS adjustments
...
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
2015-06-24 11:42:29 -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
db3e132799
[Frontend] New symbols font and CSS adjustments, in-progress
...
WTD-980
WTD-396
2015-06-23 16:07:29 -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
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
6a35476872
Merge branch 'open1149' of https://github.com/nasa/openmctweb into open1149
2015-06-19 13:55:23 -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
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
