Commit Graph

3686 Commits

Author SHA1 Message Date
Henry
9a06325533 Merge branch 'master' into open933 2016-09-12 14:39:24 -07:00
Andrew Henry
4c6ca58c95 Merge pull request from TypicalFooBar/843
[Context Menu] New Tab button available in edit mode. 
2016-09-11 21:21:49 -07:00
Henry
e639e056ba [Time Conductor] Fixing bugs found in smoke testing. Fixes 2016-09-09 18:51:47 -07:00
Henry
fbab890081 [Time Conductor] Switched conductor to mct-include rather than mct-representation to avoid warnings 2016-09-07 14:29:21 -07:00
Victor Woeltjen
5bde1de61b Merge pull request from nasa/open1166
Review and integrate generalized control-bar styling for views
2016-09-07 13:37:10 -07:00
Andrew Henry
06d229ea99 Merge pull request from charbelrami/markup
[Frontend] Tweak markup
2016-09-07 13:16:04 -07:00
Henry
d37dd52ee1 Merge branch 'master' into open933 2016-09-06 16:43:17 -07:00
Henry
7af5875dd5 [Time Conductor] Fixed code style errors 2016-09-06 10:05:10 -07:00
Andrew Henry
c6eaa3d528 [Time Conductor] Adding tests and fixing failing ones. 2016-09-05 19:32:19 -07:00
Charles Hacskaylo
39dcb937d5 [Frontend] CSS and markup tweaks
Fixes 
New control-bar height constant
Removed font-size definition in .l-view-section
2016-09-01 20:09:38 -07:00
Charles Hacskaylo
55603b927f [Frontend] Generalized markup and CSS for control-bar
Fixes 
New markup and CSS
MIgrated existing tabular views to use
new styles
2016-09-01 19:37:36 -07:00
Charles Hacskaylo
ee917b0e1d [Frontend] Initial styling for selectable styling
Fixes 
New .s-selectable, .s-hover, .s-selected and .s-moveable classes
New supporting color constants
Markup in layouts, fixed position/panels updated
Removed old commented code
2016-09-01 10:55:07 -07:00
Derek Webb
a7f830177a [Context Menu] New Tab button available in edit mode. 2016-08-29 18:33:48 -04:00
Charles Hacskaylo
2c2d9c1bfe [Frontend] Updated test specs
Fixes 
2016-08-29 14:26:27 -07:00
Charles Hacskaylo
cc6b9d4099 [Frontend] Revised mobile styles for form layout
Fixes 
2016-08-29 14:14:52 -07:00
Charles Hacskaylo
1a284ac9dc [Frontend] Proper classes added to text input configs
Fixes 
2016-08-29 14:14:51 -07:00
Charles Hacskaylo
b48ca99119 [Frontend] Sanding on larger locator control
Fixes 
2016-08-29 14:14:51 -07:00
Charles Hacskaylo
2e8d021a6a [Frontend] Improve layout of "locator"
Fixes 
Locator in Save In, Move, etc. dialog now
expands vertically to use as much vertical as
possible;
2016-08-29 14:14:51 -07:00
Victor Woeltjen
5409e3d203 Merge pull request from TypicalFooBar/101
[CommonUI] Info Bubbles allow user to copy text
2016-08-29 13:19:24 -07:00
Andrew Henry
597d66782e Merge pull request from vankessel/open1117
[Search] 'All' checked upon no filters. Fixes 
2016-08-29 14:17:07 +01:00
Kevin Van Kessel
6cbdaa442b [Search] Repurposed checkAll test.
Changed test to ensure checkAll and it's appropriate filter string are 
set whenever checkAll is changed.
Removed redundant line checking for a filter string of 'NONE' as this 
is no longer a possibility.
2016-08-28 12:01:42 -07:00
Andrew Henry
7998a3fc98 Merge pull request from nasa/locator-collapse-1008
[Locator] Don't reset root unnecessarily
2016-08-28 17:29:18 +01:00
Andrew Henry
9063996e84 Merge pull request from nasa/console-warning-1114
[Tree] Check for change before scope.$apply
2016-08-28 16:49:59 +01:00
Derek Webb
08eaa822fe Removing use of bubble-container class (issue ) 2016-08-27 21:29:30 -04:00
Derek Webb
39f2f94a53 Info bubbles now allow the user to copy text from them (issue ) 2016-08-27 21:00:37 -04:00
Henry
4cf6126d35 Refactoring based on feedback
Refactoring controller

Migrating functions off controller onto service class

Simplified modes

Adding comments

Removed unnecessary validation

Fixing testing issues
2016-08-23 18:10:05 +01:00
Kevin Van Kessel
702ebbd557 [Search] Update test for fix.
Changed test to work properly with  fix.
Checks if checkAll gets checked when no options are checked.
Checks if changing checkAll updates the filter string to ''
2016-08-22 13:19:47 -07:00
Kevin Van Kessel
e29efbbcdf [Search] 'All' selected upon no filters. Fixes
Upon deselecting every filter, the search returns nothing. This serves 
no useful purpose as discussed in . Now deselecting every filter 
automatically selects 'All'.
2016-08-22 12:52:34 -07:00
Charbel
44504feeb9 [Frontend] Tweak markup 2016-08-22 15:38:17 -03:00
Victor Woeltjen
fdbe31cb76 [Locator] Remove redundant assignment
10d2794bb7 (r75547548)
2016-08-19 14:26:03 -07:00
Victor Woeltjen
10d2794bb7 [Locator] Don't reset root unnecessarily
...as this will trigger a refresh of the mct-representation for
the tree, which will in turn create a new mct-tree instance,
resulting in any expanded/collapsed state being lost.

Fixes .
2016-08-19 13:28:56 -07:00
Victor Woeltjen
4e5887d9ec [Tree] Check for change before scope.$apply
TreeView's observers will be called when the selected domain object
changes, which can occur for one of two reasons:

1. Because a new value was set externally, from mct-tree.
2. Because a new value was selected, by the user.

In the latter case a $apply is needed, but in the former it is not
(and causes an error.) However, when that case occurs, the value in
scope will be up to date already (it was a watch that triggered the
call to treeView.value) so no assignment or $apply is necessary.

Fixes .
2016-08-15 16:04:14 -07:00
Charles Hacskaylo
4ae6da0334 [Frontend] Data viz in Time Conductor smaller
Fixes 
Reduced height of data viz bar in Time Conductor
v2;
2016-08-09 17:47:31 -07:00
Charles Hacskaylo
f3bd88837f Merge remote-tracking branch 'origin/master' into search1093-b
Conflicts:
	platform/search/res/templates/search.html
2016-08-08 17:51:39 -07:00
Charles Hacskaylo
8105a7edb8 Merge remote-tracking branch 'origin/master' into search1093-b
Conflicts:
	platform/search/res/templates/search.html
2016-08-08 17:51:25 -07:00
Charles Hacskaylo
ae39343b76 [Frontend] Fix for bad fix
Fixes 
Put overflow: hidden back at
outer wrapper level (now on .t-object.primary-pane
) which doens't clip the Inspector expand/collapse;
did better unit testing;
2016-08-08 12:14:20 -07:00
Charles Hacskaylo
62ee7e569b [Frontend] Fix for collapse Inspector button
Fixes 
Moved min-width and overflow: hidden
to TC-specific elements; removed
overflow: hidden from .primary-pane
2016-08-08 11:21:01 -07:00
Henry
7557a86208 Merge branch 'master' into open933 2016-08-05 16:37:36 -07:00
Victor Woeltjen
c8931f8535 [Tree] Simplify synchronization ()
Simplify synchronization of selection in tree with state
passed-in, letting Angular deal with more of the specifics.
Fixes .
2016-08-05 16:30:55 -07:00
Andrew Henry
0274490b68 [search] Reverted previous change to ClickAwayController and introduced a custom fix to search menu. Fixes () 2016-08-05 16:30:20 -07:00
Pete Richards
46e644e6dc Use key to retrieve default 2016-08-05 14:44:18 -07:00
Pete Richards
af7954c5a1 Trigger digests when bounds are set 2016-08-05 11:24:51 -07:00
Henry
0e0ad64830 Fixed issue with wrong deltas being applied 2016-08-04 11:00:56 -07:00
Henry
f3fd386e3b Retain time system on mode change 2016-08-03 21:03:09 -07:00
Henry
25b9f371e2 Fixed loss of time system options on navigation 2016-08-03 20:16:03 -07:00
Henry
6b482d487b Merged mode-specific defaults, with some refactoring 2016-08-03 19:57:03 -07:00
Henry
f96f78ff79 Select appropriate tick source based on mode 2016-08-03 19:34:31 -07:00
Henry
579233ade9 Fixed delta format issue on navigation 2016-08-03 18:30:01 -07:00
Pete Richards
9a72c96ea4 [TCv2] different defaults by mode 2016-08-03 18:06:39 -07:00
Henry
f4e1879a2d stop listening to tick source on time system change 2016-08-03 17:43:07 -07:00