ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,840 Commits 989 Branches 212 Tags 191 MiB
7114e9b150
Commit Graph

2840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
226f0932da [Themes] Add test cases 
Add test cases to verify that stylesheets are excluded/included
according to theme, when a theme has been specified.

nasa/openmctweb#241
 2015-11-04 11:48:49 -08:00
Victor Woeltjen
15f9bc083c Merge pull request #240 from nasa/open233b 
[Inspector] Introduce inspector pane
 2015-11-04 11:24:27 -08:00
Victor Woeltjen
1c4a4e475b [Inspector] Simplify splitter communication 2015-11-04 10:53:23 -08:00
Victor Woeltjen
f7839b758d Merge remote-tracking branch 'github/master' into open233b 
Resolve conflicts on nasa/openmctweb#233

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
	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
	platform/commonUI/general/res/sass/_main.scss
	platform/commonUI/general/res/sass/user-environ/_layout.scss
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/espresso/res/sass/_constants.scss
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2015-11-04 09:28:19 -08:00
Victor Woeltjen
ac529be55c [Time Conductor] Don't emit view event 
Don't emit an event when plot is instantiated; this is no
longer needed, as time conductor broadcasts its bounds
whenever views change.
 2015-11-03 17:01:22 -08:00
Victor Woeltjen
99376391a9 Merge remote-tracking branch 'github/master' into open229b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-11-03 16:58:40 -08:00
Charles Hacskaylo
2c7c7b90e6 Fixed JS var placement causing mvn to fail 
open #90
open #233
 2015-11-03 16:51:15 -08:00
Charles Hacskaylo
903778799f Fixed missing window reference causing test to fail 
open #90
open #233
 2015-11-03 16:45:11 -08:00
Pete Richards
9523c918fb Merge remote-tracking branch 'github-open/open182' into open-master 2015-11-03 15:52:14 -08:00
Charles Hacskaylo
09be19310b Resolved CSS conflicts 
open #90
 2015-11-03 15:44:10 -08:00
Pete Richards
b8b9b1f79a Merge remote-tracking branch 'github-open/open227' into open-master 2015-11-03 15:43:08 -08:00
Victor Woeltjen
4300338b9c Merge pull request #186 from nasa/open155 
[Notifications] Add notification infrastructure
 2015-11-03 15:38:41 -08:00
Charles Hacskaylo
6a42d0c7a1 [Frontend] Put overflow: auto back onto .object-holder 
open #232
 2015-11-03 15:28:53 -08:00
Victor Woeltjen
c0ed19fd92 Merge remote-tracking branch 'github/master' into open229b 
Merge latest into topic branch for nasa/openmctweb#229
in preparation for pull request
 2015-11-03 15:27:36 -08:00
Victor Woeltjen
df484c1800 [Time Conductor] Update TelemetryHandler spec 2015-11-03 15:27:08 -08:00
Victor Woeltjen
5940f94644 [Time Conductor] Cancel requests 
Don't callback for any telemetry requests from a TelemetryHandle
if the handle has been destroyed.
 2015-11-03 15:24:38 -08:00
Victor Woeltjen
0dccaab9cb [Search] Declare UI components as templates 
Declare Search UI components as templates instead of
representations so that they are not removed from the
DOM when no domain object is supplied. Fixes
nasa/openmctweb#234
 2015-11-02 14:07:22 -08:00
Charles Hacskaylo
c8848b5788 [Frontend] Tweaked spacing in Inspector header 
open #90
 2015-11-02 13:39:15 -08:00
Victor Woeltjen
8d65335786 [Time Conductor] Remove check for domain existence 2015-11-02 12:31:40 -08:00
Victor Woeltjen
2d1faeba8c [Time Conductor] Update FormatService JSDoc 2015-11-02 12:30:18 -08:00
Victor Woeltjen
cecc52f0a9 [Time Conductor] Update formatService usages 
...to remove checks for unknown formats.
 2015-11-02 12:28:46 -08:00
Victor Woeltjen
a1d765f271 [Time Conductor] Throw errors for unknown formats 
Per code review, nasa/openmctweb#204
 2015-11-02 12:23:13 -08:00
Charles Hacskaylo
fe12cdefc5 [Frontend] Added icon to Inspector header 
open #90
and updated icon;
 2015-11-02 11:27:56 -08:00
Charles Hacskaylo
648cdcc86e Updated crosshair symbol for inspect 
open #90
(cherry picked from commit 946a6d4)
 2015-11-02 11:08:00 -08:00
Charles Hacskaylo
946a6d4a04 Updated crosshair symbol for inspect 
open #90
 2015-11-02 11:04:38 -08:00
Charles Hacskaylo
f7588d57c2 [Frontend] Added crosshair symbol for inspect 
prod-uisymbols
open #90
(cherry picked from commit 91a4138)
 2015-11-02 10:31:44 -08:00
Charles Hacskaylo
91a4138334 Added crosshair symbol for inspect 
prod-uisymbols
open #90
 2015-11-02 10:14:28 -08:00
Charles Hacskaylo
141a54cbd6 [Frontend] Tweaks in Inspector 
open #90
Colors, spacing, properties layout mods;
 2015-10-30 23:44:15 -07:00
Charles Hacskaylo
64c6ef6cfd [Frontend] Tweaks in Inspector 
open #90
Colors, spacing, properties layout mods;
Checked in mobile and snow theme;
 2015-10-30 18:31:02 -07:00
Charles Hacskaylo
fe8d9f6717 [Frontend] Mobile and margin tweaks 
open #90
Margin off of right scrollbar added for treeview
in desktop only;
Repositioned nav to parent arrow button in
object-browse-bar;
 2015-10-30 17:22:41 -07:00
Charles Hacskaylo
c913f173e3 [Frontend] Safety merge of master; minor fixes 
open #90
IN-PROGRESS
Merged in latest from github/master;
Fixed margins when in edit mode;
Fixed edit area not utilizing overflow: auto properly;
TO-DO: verify mobile is Ok;
 2015-10-30 17:09:04 -07:00
Victor Woeltjen
ae928a138c [Representation] Update compilation approach 
Update compilation approach for templateLinker to more
closely resemble ng-include; minimizes likelihood of
subtle behavioral differences (e.g. incorrect size
selection for split pane)
 2015-10-30 16:37:47 -07:00
Charles Hacskaylo
d926110b4e Merge remote-tracking branch 'github/open155' into open155c 
open #186
open #155
Re-rendering css;
 2015-10-30 16:26:49 -07:00
Charles Hacskaylo
485e6a9de1 [wtf] Merge open155 > github/master 
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
 2015-10-30 16:24:20 -07:00
Charles Hacskaylo
1e6731e6f2 Merge open155 > github/master 
open155
open186
Trying a third time to resolve conflicts between open155 and master;
 2015-10-30 16:20:57 -07:00
Victor Woeltjen
454a63e1f1 [Representation] Destroy scopes before adding 
Destroy representation scope before adding elements back into
the DOM; avoids having a momentary activation of watches and
listeners on those scopes before they are replaced with newly
compiled content for new scopes.
 2015-10-30 16:18:01 -07:00
Victor Woeltjen
b487fa4438 [Representation] Update TemplateLinker spec 
...to reflect creation of a new scope each time a template
is changed.
 2015-10-30 16:01:24 -07:00
Victor Woeltjen
560454e7c2 [Representation] Verify change before representing 
An mct-representation may have a refresh triggered either by
a key change or a domain object change; both will typically
happen in the same digest cycle. Track what prior state was
an abort refreshes if nothing will change.
 2015-10-30 15:55:56 -07:00
Victor Woeltjen
04594ea536 [Representation] Rebuild scopes on every change 
Create new scopes on every changeTemplate request, even if
the same template is being viewed; presume that we want a
new instance of the same template. Avoids scope reuse for
cases such as switching from a plot of one object to a
plot of another object.
 2015-10-30 15:32:20 -07:00
Charles Hacskaylo
b5b6546710 [Frontend] Significant change to look and behavior of mini-tabs 
open #90
IN-PROGRESS
mini-tab location in markup in browse.html changed;
Single menu icon for collapsed treeview;
Close 'x' boxes instead of arrow icons;
TO-DO: verify mobile is Ok;
 2015-10-30 15:25:12 -07:00
Victor Woeltjen
a45dfc3822 [Representation] Don't reuse scopes 
Addresses nasa/openmctweb#227
 2015-10-30 15:09:35 -07:00
Victor Woeltjen
f7f6b8d612 [Time Conductor] Don't broadcast on telemetry:view 
Instead, use delay from throttling initial bounds broadcast to
avoid broadcasting bounds prematurely.
 2015-10-30 14:59:32 -07:00
Victor Woeltjen
e4a14b7603 [Time Conductor] Consistently throttle broadcast 
Consistently throttle broadcast of bounds to minimize redundant
broadcasts, nasa/openmctweb#229
 2015-10-30 14:56:52 -07:00
Victor Woeltjen
5706fa4567 Merge branch 'open182' into open229 2015-10-30 14:54:37 -07:00
Victor Woeltjen
796d6b800a [Time Conductor] Add JSDoc for params 2015-10-30 14:08:11 -07:00
Victor Woeltjen
b12bb55495 [Time Conductor] Update text on format change 
...in a date-time field.
 2015-10-30 13:57:21 -07:00
Victor Woeltjen
f42498ab60 [Time Conductor] Update specs 
...to reflect changes to how unspecified versus unknown formats
are handled.
 2015-10-30 13:53:33 -07:00
Victor Woeltjen
ec56fe7bfd Merge pull request #222 from nasa/open195 
[Representation] Remove unknown templates from DOM
 2015-10-30 13:39:14 -07:00
Victor Woeltjen
4abb48abd8 [Representation] Update parameters in JSDoc 2015-10-30 13:34:13 -07:00
Victor Woeltjen
7f571415dc [Time Conductor] Change format handling 
Use default format when no format is specified, and throw an
error when a specified format is unrecognized, from both
date-time field controller and time range controller.
 2015-10-30 13:28:01 -07:00