[Plot] Wait for width before loading

Plot waits for element to have width before loading. Otherwise, it may make a minmax request with an invalid size parameter. Fixes https://github.com/nasa/openmct/issues/1974
Allow property values of zero. (#1961 )
2018-04-03 14:53:49 -07:00 · 2018-03-27 10:02:15 -07:00 · 2018-03-26 13:28:56 -07:00 · 2018-03-26 11:30:28 -07:00
13 changed files with 264 additions and 238 deletions
--- a/example/generator/GeneratorProvider.js
+++ b/example/generator/GeneratorProvider.js
@@ -66,7 +66,7 @@ define([
            if (request && request.hasOwnProperty(prop)) {
                workerRequest[prop] = request[prop];
            }
-            if (!workerRequest[prop]) {
+            if (!workerRequest.hasOwnProperty(prop)) {
                workerRequest[prop] = REQUEST_DEFAULTS[prop];
            }
            workerRequest[prop] = Number(workerRequest[prop]);
--- a/package.json
+++ b/package.json
@@ -3,16 +3,16 @@
  "version": "0.13.3-SNAPSHOT",
  "description": "The Open MCT core platform",
  "dependencies": {
-    "d3-array": "^1.0.2",
-    "d3-axis": "^1.0.4",
-    "d3-collection": "^1.0.2",
-    "d3-color": "^1.0.2",
-    "d3-format": "^1.0.2",
-    "d3-interpolate": "^1.1.3",
-    "d3-scale": "^1.0.4",
-    "d3-selection": "^1.0.3",
-    "d3-time": "^1.0.4",
-    "d3-time-format": "^2.0.3",
+    "d3-array": "1.2.x",
+    "d3-axis": "1.0.x",
+    "d3-collection": "1.0.x",
+    "d3-color": "1.0.x",
+    "d3-format": "1.2.x",
+    "d3-interpolate": "1.1.x",
+    "d3-scale": "1.0.x",
+    "d3-selection": "1.3.x",
+    "d3-time": "1.0.x",
+    "d3-time-format": "2.1.x",
    "express": "^4.13.1",
    "minimist": "^1.1.1",
    "request": "^2.69.0",
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-//@import "effects";
+@import "effects";
@import "glyphs";
@import "animations";
@import "global";
--- a/platform/commonUI/general/res/sass/_mixins.scss
+++ b/platform/commonUI/general/res/sass/_mixins.scss
@@ -283,12 +283,12 @@

 /*********************************************** CONTROLS, FORM ELEMENTS */

-//@mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) {
-//	background: $bg;
-//	//border-radius: $controlCr;
-//	//box-sizing: border-box;
-//	color: $fg;
-//}
+@mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) {
+	background-color: $bg;
+	//border-radius: $controlCr;
+	box-sizing: border-box;
+	color: $fg;
+}

@mixin btnBase($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) {
 	@include user-select(none);
@@ -311,79 +311,11 @@
 }

@mixin btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) {
-    @include containerSubtle($bg, $fg); // Varies per theme
+    @include containerSubtle($bg, $fg);
    @include btnBase($bgHov: $bgHov, $fg: $fg, $fgHov: $fgHov, $ic: $ic, $icHov: $icHov);
    text-shadow: $shdwItemText;
 }

-@mixin sButton(
-    $bg: $colorBtnBg,
-    $bgHov: $colorBtnBgHov,
-    $fg: $colorBtnFg,
-    $fgHov: $colorBtnFgHov,
-    $ic: $colorBtnIcon,
-    $icHov: $colorBtnIconHov,
-    $important: false) {
-    $baseRatio: 1.5;
-    $pad: $interiorMargin * $baseRatio;
-    $imp: '';
-    @if $important == true {
-        $imp: !important;
-    }
-    //@include user-select(none);
-    @include btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $ic: $colorBtnIcon);
-    box-sizing: border-box;
-
-    cursor: pointer;
-    display: inline-block;
-    font-size: 0.7rem;
-    text-decoration: none;
-    height: $btnStdH;
-    line-height: $btnStdH;
-    padding: 0 $pad;
-
-    &.lg {
-        font-size: 1rem;
-    }
-
-    &.sm {
-        padding: 0 $pad / $baseRatio;
-    }
-
-    &.vsm {
-        padding: 0 ($pad / $baseRatio) / 2;
-    }
-
-    &.major {
-        @include btnSubtle($bg: $colorBtnMajorBg, $bgHov: $colorBtnMajorBgHov, $fg: $colorBtnMajorFg, $fgHov: $colorBtnMajorFgHov, $ic: $colorBtnMajorFg, $icHov: $colorBtnMajorFgHov);
-    }
-
-    &.no-label {
-        .label, .title-label { display: none; }
-    }
-
-    &[disabled="true"] {
-        opacity: 0.3;
-    }
-
-    &.pause-play {
-        @extend .icon-pause;
-        &.paused {
-            @include btnSubtle($bg: $colorPausedBg, $bgHov: pushBack($colorPausedBg, 10%), $fg: $colorPausedFg, $ic: $colorPausedFg);
-            @extend .icon-play;
-            &:before { @include pulse($dur: 1000ms); }
-        }
-    }
-
-    .icon {
-        font-size: 0.8rem;
-    }
-
-    .title-label {
-        vertical-align: top;
-    }
-}
-
@mixin input-base() {
 	@include appearance(none);
 	border-radius: $controlCr;
@@ -513,42 +445,3 @@
    color: rgba($colorTelemFresh, $a) !important;
    font-style: italic;
 }
-
-/********************************************* EFFECTS */
-@mixin pulse($animName: pulse, $dur: 500ms, $iteration: infinite, $opacity0: 0.5, $opacity100: 1) {
-    @include keyframes($animName) {
-        0%   { opacity: $opacity0; }
-        100% { opacity: $opacity100; }
-    }
-    @include animation-name($animName);
-    @include animation-duration($dur);
-    @include animation-direction(alternate);
-    @include animation-iteration-count($iteration);
-    @include animation-timing-function(ease-in-out);
-}
-
-.pulse {
-    @include pulse($animName: pulse, $dur: 750ms);
-}
-
-.pulse-subtle {
-    @include pulse($animName: pulse-subtle, $dur: 500ms, $opacity0: 0.7);
-}
-
-@mixin animTo($animName, $propName, $propValStart, $propValEnd, $dur: 500ms, $delay: 0, $dir: normal, $count: 1) {
-    @include keyframes($animName) {
-        from { #{propName}: $propValStart; }
-        to { #{$propName}: $propValEnd; }
-    }
-    @include animToParams($animName, $dur: $dur, $delay: $delay, $dir: $dir, $count: $count)
-}
-
-@mixin animToParams($animName, $dur: 500ms, $delay: 0, $dir: normal, $count: 1) {
-    @include animation-name($animName);
-    @include animation-duration($dur);
-    @include animation-delay($delay);
-    @include animation-fill-mode(both);
-    @include animation-direction($dir);
-    @include animation-iteration-count($count);
-    @include animation-timing-function(ease-in-out);
-}
--- a/platform/commonUI/general/res/sass/controls/_buttons.scss
+++ b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -19,8 +19,62 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+$baseRatio: 1.5;
+$pad: $interiorMargin * $baseRatio;
+
 .s-button {
-    @include sButton();
+    @include user-select(none);
+    @include btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $ic: $colorBtnIcon);
+    box-sizing: border-box;
+    cursor: pointer;
+    display: inline-block;
+    font-size: 0.7rem;
+    text-decoration: none;
+    height: $btnStdH;
+    line-height: $btnStdH;
+    padding: 0 $pad;
+
+    &.labeled:before {
+        // Icon when it's included
+        margin-right: $interiorMarginSm;
+    }
+
+	&.lg {
+		font-size: 1rem;
+	}
+
+    &.sm {
+        padding: 0 $pad / $baseRatio;
+    }
+
+    &.vsm {
+        padding: 0 ($pad / $baseRatio) / 2;
+    }
+
+    &.major {
+        @include btnSubtle($bg: $colorBtnMajorBg, $bgHov: $colorBtnMajorBgHov, $fg: $colorBtnMajorFg, $fgHov: $colorBtnMajorFgHov, $ic: $colorBtnMajorFg, $icHov: $colorBtnMajorFgHov);
+    }
+
+    &.no-label {
+        .label, .title-label { display: none; }
+    }
+
+    &.pause-play {
+        @extend .icon-pause;
+        &.paused {
+            @include btnSubtle($bg: $colorPausedBg, $bgHov: pushBack($colorPausedBg, 10%), $fg: $colorPausedFg, $ic: $colorPausedFg);
+            @extend .icon-play;
+            &:before { @include pulse($dur: 1000ms); }
+        }
+    }
+
+    .icon {
+        font-size: 0.8rem;
+    }
+
+    .title-label {
+        vertical-align: top;
+    }
 }

 body.desktop .mini-tab-icon {
--- a/platform/commonUI/general/res/sass/mobile/_tree.scss
+++ b/platform/commonUI/general/res/sass/mobile/_tree.scss
@@ -52,9 +52,6 @@ body.touch {
    }

    .selector-list .tree-item {
-        background: $colorMobileSelectListTreeItemBg;
-        box-sizing: border-box;
-        color: $colorBodyFg;
+        @include containerBase($bg: $colorMobileSelectListTreeItemBg);
    }
-
 }
--- a/platform/commonUI/themes/espresso/res/sass/_constants.scss
+++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss
@@ -20,16 +20,16 @@ $smallCr: 2px;
 $overlayCr: 11px;

 // Buttons and Controls
-$colorBtnBg: #454545;
-$colorBtnBgHov: #5e5e5e;
+$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent);
+$colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent);
 $colorBtnFg: $colorBodyFg;
-$colorBtnFgHov: #b3b3b3;
+$colorBtnFgHov: pullForward($colorBtnFg, $hoverRatioPercent);
 $colorBtnIcon: $colorBtnFg;
 $colorBtnIconHov: $colorBtnFgHov;
 $colorBtnMajorBg: $colorKey;
-$colorBtnMajorBgHov: deepskyblue;
+$colorBtnMajorBgHov: pullForward($colorBtnMajorBg, $hoverRatioPercent);
 $colorBtnMajorFg: $colorKeyFg;
-$colorBtnMajorFgHov: white;
+$colorBtnMajorFgHov: pullForward($colorBtnMajorFg, $hoverRatioPercent);
 $colorClickIcon: $colorKey;
 $colorClickIconHov: $colorKeyHov;
 $colorToggleIcon: rgba($colorBodyFg, 0.5);
@@ -44,7 +44,7 @@ $sliderColorRangeHolder: rgba(black, 0.1);
 $sliderColorRange: rgba($sliderColorBase, 0.3);
 $sliderColorRangeHov: rgba($sliderColorBase, 0.5);
 $sliderColorKnob: $sliderColorBase;
-$sliderColorKnobHov: #33ccff;
+$sliderColorKnobHov: pullForward($sliderColorKnob, $ltGamma);
 $sliderColorRangeValHovBg: rgba($sliderColorBase, 0.1);
 $sliderColorRangeValHovFg: $colorKeyFg;
 $sliderKnobW: 15px;
@@ -69,17 +69,17 @@ $colorCreateBtn: $colorKey;
 $colorGridLines: rgba(#fff, 0.05);
 $colorInvokeMenu: #fff;
 $colorObjHdrTxt: $colorBodyFg;
-$colorObjHdrIc: #cccccc;
+$colorObjHdrIc: lighten($colorObjHdrTxt, 20%);
 $colorTick: rgba(white, 0.2);
 $colorSelectableSelectedPrimary: $colorKey;
-$colorSelectableSelectedSecondary: #004d66;
+$colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%);
 $colorSelectableHov: $colorSelectableSelectedSecondary;

 // Menu colors
-$colorMenuBg: #6e6e6e;
-$colorMenuFg: white;
-$colorMenuIc: #24c8ff;
-$colorMenuHovBg: #878787;
+$colorMenuBg: pullForward($colorBodyBg, 23%);
+$colorMenuFg: pullForward($colorMenuBg, 70%);
+$colorMenuIc: pullForward($colorKey, 17%);
+$colorMenuHovBg: pullForward($colorMenuBg, $hoverRatioPercent);
 $colorMenuHovFg: #fff;
 $colorMenuHovIc: $colorMenuHovFg;
 $shdwMenu: none;
@@ -98,19 +98,19 @@ $colorFormFieldErrorFg: rgba(#fff, 0.6);
 $colorFormLines: rgba(#fff, 0.1);
 $colorFormSectionHeader: rgba(#fff, 0.1);
 $colorInputBg: rgba(#000, 0.1);
-$colorInputFg: #cccccc;
-$colorInputPlaceholder: #666666;
+$colorInputFg: pullForward($colorBodyFg, 20%);
+$colorInputPlaceholder: pushBack($colorBodyFg, 20%);
 $colorFormText: rgba(#fff, 0.5);
-$colorInputIcon: #737373;
-$colorFieldHint: #cccccc;
+$colorInputIcon: pushBack($colorBodyFg, 15%);
+$colorFieldHint: pullForward($colorBodyFg, 20%);

 // Inspector
-$colorInspectorBg: #3b3b3b;
+$colorInspectorBg: pullForward($colorBodyBg, 3%);
 $colorInspectorFg: $colorBodyFg;
-$colorInspectorPropName: #737373;
-$colorInspectorPropVal: #bfbfbf;
+$colorInspectorPropName: pushBack($colorBodyFg, 15%);
+$colorInspectorPropVal: pullForward($colorInspectorFg, 15%);
 $colorInspectorSectionHeaderBg: $colorFormSectionHeader;
-$colorInspectorSectionHeaderFg: #a1a1a1;
+$colorInspectorSectionHeaderFg: pullForward($colorInspectorBg, 40%);

 // Status colors, mainly used for messaging and item ancillary symbols
 $colorStatusFg: #ccc;
@@ -132,8 +132,8 @@ $colorSelectBg: $colorBtnBg;
 $colorSelectFg: $colorBtnFg;

 // Limits, status and staleness colors
-$colorTelemFresh: #cccccc;
-$colorTelemStale: #666666;
+$colorTelemFresh: pullForward($colorBodyFg, 20%);
+$colorTelemStale: pushBack($colorBodyFg, 20%);
 $styleTelemStale: italic;
 $colorLimitYellowBg: rgba($colorWarningLo, 0.3);
 $colorLimitYellowIc: $colorWarningLo;
@@ -143,23 +143,23 @@ $colorLimitRedIc: $colorWarningHi;
 // Bubble colors
 $colorInfoBubbleBg: #ddd;
 $colorInfoBubbleFg: #666;
-$colorThumbsBubbleFg: #b3b3b3;
-$colorThumbsBubbleBg: #4d4d4d;
+$colorThumbsBubbleFg: pullForward($colorBodyFg, 10%);
+$colorThumbsBubbleBg: pullForward($colorBodyBg, 10%);

 // Overlay
 $colorOvrBlocker: rgba(black, 0.7);
-$colorOvrBg: #4d4d4d;
-$colorOvrFg: #e6e6e6;
-$colorOvrBtnBg: gray;
+$colorOvrBg: pullForward($colorBodyBg, 10%);
+$colorOvrFg: pullForward($colorBodyFg, 30%);
+$colorOvrBtnBg: pullForward($colorOvrBg, 20%);
 $colorOvrBtnFg: #fff;
-$colorFieldHintOverlay: #999999;
+$colorFieldHintOverlay: pullForward($colorOvrBg, 30%);
 $durLargeViewExpand: 250ms;

 // Items
-$colorItemBg: #404040;
-$colorItemBgHov: #595959;
-$colorItemFg: #bfbfbf;
-$colorItemFgDetails: #8c8c8c;
+$colorItemBg: lighten($colorBodyBg, 5%);
+$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent);
+$colorItemFg: lighten($colorItemBg, 50%);
+$colorItemFgDetails: lighten($colorItemBg, 30%);
 $colorItemIc: $colorKey;
 $colorItemSubIcons: $colorItemFgDetails;
 $colorItemOpenIcon: $colorItemFgDetails;
@@ -167,9 +167,9 @@ $shdwItemText: rgba(black, 0.1) 0 1px 2px;
 $colorItemBgSelected: $colorKey;

 // Tabular
-$colorTabBorder: #404040;
-$colorTabBodyBg: #1a1a1a;
-$colorTabBodyFg: gray;
+$colorTabBorder: pullForward($colorBodyBg, 5%);
+$colorTabBodyBg: darken($colorBodyBg, 10%);
+$colorTabBodyFg: lighten($colorTabBodyBg, 40%);
 $colorTabHeaderBg: rgba(white, 0.1);
 $colorTabHeaderFg: $colorBodyFg;
 $colorTabHeaderBorder: $colorBodyBg;
@@ -180,22 +180,22 @@ $colorPlotFg: $colorBodyFg;
 $colorPlotHash: $colorTick;
 $stylePlotHash: dashed;
 $colorPlotAreaBorder: $colorInteriorBorder;
-$colorPlotLabelFg: #666666;
+$colorPlotLabelFg: pushBack($colorPlotFg, 20%);
 $legendCollapsedNameMaxW: 50%;
 $legendHoverValueBg: rgba($colorBodyFg, 0.1);

 // Tree
-$colorItemTreeHoverBg: #4d4d4d;
-$colorItemTreeHoverFg: #b3b3b3;
+$colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent);
+$colorItemTreeHoverFg: pullForward($colorBodyFg, $hoverRatioPercent);
 $colorItemTreeIcon: $colorKey;
-$colorItemTreeIconHover: #33ccff;
+$colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%);
 $colorItemTreeFg: $colorBodyFg;
-$colorItemTreeSelectedBg: #006080;
-$colorItemTreeSelectedFg: #cccccc;
+$colorItemTreeSelectedBg: pushBack($colorKey, 15%);
+$colorItemTreeSelectedFg: pullForward($colorBodyFg, 20%);
 $colorItemTreeEditingBg: #344154;
 $colorItemTreeEditingFg: $colorEditAreaFg;
 $colorItemTreeVC: $colorBodyFg;
-$colorItemTreeVCHover: #cccccc;
+$colorItemTreeVCHover: pullForward($colorItemTreeVC, 20%);
 $colorItemTreeSelectedVC: $colorItemTreeVC;
 $shdwItemTreeIcon: 0.6;

@@ -206,36 +206,36 @@ $colorThumbHoverBg: $colorItemTreeHoverBg;
 $scrollbarTrackSize: 7px;
 $scrollbarTrackShdw: rgba(#000, 0.5) 0 1px 5px;
 $scrollbarTrackColorBg: transparent; //rgba(#000, 0.4);
-$scrollbarThumbColor: #4d4d4d;
-$scrollbarThumbColorHov: #525252;
-$scrollbarThumbColorOverlay: #666666;
-$scrollbarThumbColorOverlayHov: #6b6b6b;
-$scrollbarThumbColorMenu: #a1a1a1;
-$scrollbarThumbColorMenuHov: #a6a6a6;
+$scrollbarThumbColor: pullForward($colorBodyBg, 10%);
+$scrollbarThumbColorHov: pullForward($scrollbarThumbColor, 2%);
+$scrollbarThumbColorOverlay: pullForward($colorOvrBg, 10%);
+$scrollbarThumbColorOverlayHov: pullForward($scrollbarThumbColorOverlay, 2%);
+$scrollbarThumbColorMenu: pullForward($colorMenuBg, 20%);
+$scrollbarThumbColorMenuHov: pullForward($scrollbarThumbColorMenu, 2%);

 // Splitter
 // All splitterD* values MUST both be either odd or even numbers
 $splitterD: 20px;
 $splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view
 $splitterHandleD: 2px;
-$colorSplitterBaseBg: #4d4d4d;
+$colorSplitterBaseBg: pullForward($colorBodyBg, 10%);
 $colorSplitterBg: $colorSplitterBaseBg;
 $splitterShdw: rgba(black, 0.4) 0 0 3px;
 $splitterEndCr: none;
-$colorSplitterHover: #666666;
+$colorSplitterHover: pullForward($colorSplitterBg, $hoverRatioPercent);
 $colorSplitterActive: $colorKey;

 // Minitabs
 $uePaneMiniTabH: 24px;
 $uePaneMiniTabW: 8px;
 $colorMiniTabBg: $colorSplitterBg;
-$colorMiniTabFg: #333333;
+$colorMiniTabFg: pushBack($colorMiniTabBg, 10%);
 $colorMiniTabBgHov: $colorSplitterHover;
 $colorMiniTabFgHov: #fff;

 // Mobile
-$colorMobilePaneLeft: #262626;
-$colorMobilePaneLeftTreeItemBg: #2e2e2e;
+$colorMobilePaneLeft: darken($colorBodyBg, 5%);
+$colorMobilePaneLeftTreeItemBg: pullForward($colorMobilePaneLeft, 3%);
 $colorMobileSelectListTreeItemBg: rgba(#fff, 0.05);

 // Datetime Picker
@@ -243,10 +243,10 @@ $colorCalCellHovBg: $colorKey;
 $colorCalCellHovFg: $colorKeyFg;
 $colorCalCellSelectedBg: $colorItemTreeSelectedBg;
 $colorCalCellSelectedFg: $colorItemTreeSelectedFg;
-$colorCalCellInMonthBg: #616161;
+$colorCalCellInMonthBg: pushBack($colorMenuBg, 5%);

 // Palettes
-$colorPaletteFg: #bbbbbb;
+$colorPaletteFg: pullForward($colorMenuBg, 30%);
 $colorPaletteSelected: #fff;
 $shdwPaletteFg: black 0 0 2px;
 $shdwPaletteSelected: inset 0 0 0 1px #000;
@@ -256,4 +256,4 @@ $colorAboutLink: #84b3ff;

 // Loading
 $colorLoadingFg: $colorAlt1;
-$colorLoadingBg: rgba($colorBodyFg, 0.2);
+$colorLoadingBg: rgba($colorBodyFg, 0.2);
--- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss
+++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss
@@ -1,6 +1,6 @@
@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $gradRatio: 5%) {
-    color: $fg;
-	@include background-image(linear-gradient(lighten($bg, $gradRatio), $bg));
+	@include containerBase($bg, $fg);
+	@include background-image(linear-gradient(pullForward($bg, $gradRatio), $bg));
 	@include boxShdw($shdwBtns);
 }

--- a/platform/commonUI/themes/snow/res/sass/_constants.scss
+++ b/platform/commonUI/themes/snow/res/sass/_constants.scss
@@ -20,8 +20,8 @@ $smallCr: 3px;
 $overlayCr: 11px;

 // Buttons and Controls
-$colorBtnBg: #969696;
-$colorBtnBgHov: #7d7d7d;
+$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent);
+$colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent);
 $colorBtnFg: #fff;
 $colorBtnFgHov: $colorBtnFg;
 $colorBtnIcon: #eee;
@@ -29,7 +29,7 @@ $colorBtnIconHov: $colorBtnFgHov;
 $colorBtnMajorBg: $colorKey;
 $colorBtnMajorBgHov: $colorKeyHov;
 $colorBtnMajorFg: $colorKeyFg;
-$colorBtnMajorFgHov: white;
+$colorBtnMajorFgHov: pushBack($colorBtnMajorFg, $hoverRatioPercent);
 $colorClickIcon: $colorKey;
 $colorClickIconHov: $colorKeyHov;
 $colorToggleIcon: rgba($colorClickIcon, 0.5);
@@ -43,7 +43,7 @@ $sliderColorBase: $colorKey;
 $sliderColorRangeHolder: rgba(black, 0.07);
 $sliderColorRange: rgba($sliderColorBase, 0.2);
 $sliderColorRangeHov: rgba($sliderColorBase, 0.4);
-$sliderColorKnob: #33ccff;
+$sliderColorKnob: pushBack($sliderColorBase, 20%);
 $sliderColorKnobHov: rgba($sliderColorBase, 0.7);
 $sliderColorRangeValHovBg: $sliderColorRange;
 $sliderColorRangeValHovFg: $colorBodyFg;
@@ -69,17 +69,17 @@ $colorCreateBtn: $colorKey;
 $colorGridLines: rgba(#000, 0.05);
 $colorInvokeMenu: #fff;
 $colorObjHdrTxt: $colorBodyFg;
-$colorObjHdrIc: #b3b3b3;
+$colorObjHdrIc: lighten($colorObjHdrTxt, 30%);
 $colorTick: rgba(black, 0.2);
 $colorSelectableSelectedPrimary: $colorKey;
-$colorSelectableSelectedSecondary: #33ccff;
+$colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%);
 $colorSelectableHov: $colorSelectableSelectedSecondary;

 // Menu colors
-$colorMenuBg: white;
-$colorMenuFg: #4d4d4d;
+$colorMenuBg: pushBack($colorBodyBg, 10%);
+$colorMenuFg: pullForward($colorMenuBg, 70%);
 $colorMenuIc: $colorKey;
-$colorMenuHovBg: #e6e6e6;
+$colorMenuHovBg: pullForward($colorMenuBg, $hoverRatioPercent);
 $colorMenuHovFg: $colorMenuFg;
 $colorMenuHovIc: $colorMenuIc;
 $shdwMenu: rgba(black, 0.5) 0 1px 5px;
@@ -99,18 +99,18 @@ $colorFormLines: rgba(#000, 0.1);
 $colorFormSectionHeader: rgba(#000, 0.05);
 $colorInputBg: $colorGenBg;
 $colorInputFg: $colorBodyFg;
-$colorInputPlaceholder: #999999;
-$colorFormText: gray;
-$colorInputIcon: #a6a6a6;
-$colorFieldHint: black;
+$colorInputPlaceholder: pushBack($colorBodyFg, 20%);
+$colorFormText: pushBack($colorBodyFg, 10%);
+$colorInputIcon: pushBack($colorBodyFg, 25%);
+$colorFieldHint: pullForward($colorBodyFg, 40%);

 // Inspector
-$colorInspectorBg: #efefef;
+$colorInspectorBg: pullForward($colorBodyBg, 5%);
 $colorInspectorFg: $colorBodyFg;
-$colorInspectorPropName: #999999;
-$colorInspectorPropVal: #404040;
-$colorInspectorSectionHeaderBg: #e3e3e3;
-$colorInspectorSectionHeaderFg: #898989;
+$colorInspectorPropName: pushBack($colorBodyFg, 20%);
+$colorInspectorPropVal: pullForward($colorInspectorFg, 15%);
+$colorInspectorSectionHeaderBg: pullForward($colorInspectorBg, 5%);
+$colorInspectorSectionHeaderFg: pullForward($colorInspectorBg, 40%);

 // Status colors, mainly used for messaging and item ancillary symbols
 $colorStatusFg: #999;
@@ -132,8 +132,8 @@ $colorSelectBg: $colorBtnBg;
 $colorSelectFg: $colorBtnFg;

 // Limits and staleness colors//
-$colorTelemFresh: #333333;
-$colorTelemStale: #999999;
+$colorTelemFresh: pullForward($colorBodyFg, 20%);
+$colorTelemStale: pushBack($colorBodyFg, 20%);
 $styleTelemStale: italic;
 $colorLimitYellowBg: rgba(#ffaa00, 0.3);
 $colorLimitYellowIc: #ffaa00;
@@ -143,23 +143,23 @@ $colorLimitRedIc: red;
 // Bubble colors
 $colorInfoBubbleBg: $colorMenuBg;
 $colorInfoBubbleFg: #666;
-$colorThumbsBubbleFg: #4d4d4d;
-$colorThumbsBubbleBg: #e3e3e3;
+$colorThumbsBubbleFg: pullForward($colorBodyFg, 10%);
+$colorThumbsBubbleBg: pullForward($colorBodyBg, 10%);

 // Overlay
-$colorOvrBlocker: rgba(black, 0.7);
+$colorOvrBlocker: rgba(black, 0.7);//
 $colorOvrBg: $colorBodyBg;
 $colorOvrFg: $colorBodyFg;
-$colorOvrBtnBg: #969696;
+$colorOvrBtnBg: pullForward($colorOvrBg, 40%);
 $colorOvrBtnFg: #fff;
-$colorFieldHintOverlay: #969696;
+$colorFieldHintOverlay: pullForward($colorOvrBg, 40%);
 $durLargeViewExpand: 250ms;

 // Items
 $colorItemBg: #ddd;
-$colorItemBgHov: #cbcbcb;
+$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent * 0.7);
 $colorItemFg: $colorBodyFg;
-$colorItemFgDetails: #8c8c8c;
+$colorItemFgDetails: pushBack($colorItemFg, 15%);
 $colorItemIc: $colorKey;
 $colorItemSubIcons: $colorItemFgDetails;
 $colorItemOpenIcon: $colorItemFgDetails;
@@ -167,11 +167,11 @@ $shdwItemText: none;
 $colorItemBgSelected: $colorKey;

 // Tabular
-$colorTabBorder: #e3e3e3;
+$colorTabBorder: pullForward($colorBodyBg, 10%);
 $colorTabBodyBg: $colorBodyBg;
-$colorTabBodyFg: #333333;
-$colorTabHeaderBg: #e3e3e3;
-$colorTabHeaderFg: #333333;
+$colorTabBodyFg: pullForward($colorBodyFg, 20%);
+$colorTabHeaderBg: pullForward($colorBodyBg, 10%);
+$colorTabHeaderFg: pullForward($colorBodyFg, 20%);
 $colorTabHeaderBorder: $colorBodyBg;

 // Plot
@@ -180,17 +180,17 @@ $colorPlotFg: $colorBodyFg;
 $colorPlotHash: $colorTick;
 $stylePlotHash: dashed;
 $colorPlotAreaBorder: $colorInteriorBorder;
-$colorPlotLabelFg: #999999;
+$colorPlotLabelFg: pushBack($colorPlotFg, 20%);
 $legendCollapsedNameMaxW: 50%;
 $legendHoverValueBg: rgba($colorBodyFg, 0.2);

 // Tree
-$colorItemTreeHoverBg: #e3e3e3;
-$colorItemTreeHoverFg: #4d4d4d;
+$colorItemTreeHoverBg: pullForward($colorBodyBg, $hoverRatioPercent);
+$colorItemTreeHoverFg: pullForward($colorBodyFg, $hoverRatioPercent);
 $colorItemTreeIcon: $colorKey;
 $colorItemTreeIconHover: $colorItemTreeIcon;
 $colorItemTreeFg: $colorBodyFg;
-$colorItemTreeSelectedBg: #1ac6ff;
+$colorItemTreeSelectedBg: pushBack($colorKey, 15%);
 $colorItemTreeSelectedFg: $colorBodyBg;
 $colorItemTreeEditingBg: #caf1ff;
 $colorItemTreeEditingFg: $colorEditAreaFg;
@@ -206,12 +206,12 @@ $colorThumbHoverBg: $colorItemTreeHoverBg;
 $scrollbarTrackSize: 7px;
 $scrollbarTrackShdw: rgba(#000, 0.2) 0 1px 2px;
 $scrollbarTrackColorBg: rgba(#000, 0.2);
-$scrollbarThumbColor: #7d7d7d;
+$scrollbarThumbColor: darken($colorBodyBg, 50%);
 $scrollbarThumbColorHov: $colorKey;
-$scrollbarThumbColorOverlay: #7d7d7d;
+$scrollbarThumbColorOverlay: darken($colorOvrBg, 50%);
 $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov;
-$scrollbarThumbColorMenu: #e6e6e6;
-$scrollbarThumbColorMenuHov: #e0e0e0;
+$scrollbarThumbColorMenu: pullForward($colorMenuBg, 10%);
+$scrollbarThumbColorMenuHov: pullForward($scrollbarThumbColorMenu, 2%);

 // Splitter
 // All splitterD* values MUST both be either odd or even numbers
@@ -219,23 +219,23 @@ $splitterD: 16px;
 $splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view
 $splitterHandleD: 2px;
 $colorSplitterBaseBg: $colorBodyBg;
-$colorSplitterBg: #d6d6d6;
+$colorSplitterBg: pullForward($colorSplitterBaseBg, 15%);
 $splitterShdw: none;
 $splitterEndCr: none;
-$colorSplitterHover: #a3a3a3;
+$colorSplitterHover: pullForward($colorSplitterBg, $hoverRatioPercent * 2);
 $colorSplitterActive: $colorKey;

 // Minitabs
 $uePaneMiniTabH: 24px;
 $uePaneMiniTabW: 8px;
 $colorMiniTabBg: $colorSplitterBg;
-$colorMiniTabFg: #898989;
+$colorMiniTabFg: pullForward($colorMiniTabBg, 30%);
 $colorMiniTabBgHov: $colorSplitterHover;
 $colorMiniTabFgHov: #fff;

 // Mobile
-$colorMobilePaneLeft: #f7f7f7;
-$colorMobilePaneLeftTreeItemBg: #efefef;
+$colorMobilePaneLeft: darken($colorBodyBg, 2%);
+$colorMobilePaneLeftTreeItemBg: pullForward($colorMobilePaneLeft, 3%);
 $colorMobileSelectListTreeItemBg: rgba(#000, 0.05);

 // Datetime Picker, Calendar
@@ -243,10 +243,10 @@ $colorCalCellHovBg: $colorKey;
 $colorCalCellHovFg: $colorKeyFg;
 $colorCalCellSelectedBg: $colorItemTreeSelectedBg;
 $colorCalCellSelectedFg: $colorItemTreeSelectedFg;
-$colorCalCellInMonthBg: #f2f2f2;
+$colorCalCellInMonthBg: pullForward($colorMenuBg, 5%);

 // Palettes
-$colorPaletteFg: #b3b3b3;
+$colorPaletteFg: pullForward($colorMenuBg, 30%);
 $colorPaletteSelected: #333;
 $shdwPaletteFg: none;
 $shdwPaletteSelected: inset 0 0 0 1px #fff;
--- a/platform/commonUI/themes/snow/res/sass/_mixins.scss
+++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss
@@ -1,6 +1,5 @@
@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $gradRatio: 5%) {
-    background: $bg;
-    color: $fg;
+	@include containerBase($bg, $fg);
 	@include boxShdw($shdwBtns);
 }

--- a/src/api/types/TypeRegistry.js
+++ b/src/api/types/TypeRegistry.js
@@ -90,7 +90,7 @@ define(['./Type'], function (Type) {
    /**
     * Retrieve a registered type by its key.
     * @method get
-     * @param {string} typeKey the key for htis type
+     * @param {string} typeKey the key for this type
     * @memberof module:openmct.TypeRegistry#
     * @returns {module:openmct.Type} the registered type
     */
--- a/src/api/types/TypeRegistrySpec.js
+++ b/src/api/types/TypeRegistrySpec.js
@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(['./TypeRegistry', './Type'], function (TypeRegistry, Type) {
+    describe('The Type API', function () {
+        var typeRegistryInstance;
+
+        beforeEach(function () {
+            typeRegistryInstance = new TypeRegistry ();
+            typeRegistryInstance.addType('testType', {
+                name: 'Test Type',
+                description: 'This is a test type.',
+                creatable: true
+            });
+        });
+
+        it('types can be standardized', function () {
+            typeRegistryInstance.addType('standardizationTestType', {
+                label: 'Test Type',
+                description: 'This is a test type.',
+                creatable: true
+            });
+            typeRegistryInstance.standardizeType(typeRegistryInstance.types.standardizationTestType);
+            expect(typeRegistryInstance.get('standardizationTestType').definition.label).toBeUndefined();
+            expect(typeRegistryInstance.get('standardizationTestType').definition.name).toBe('Test Type');
+        });
+
+        it('new types are registered successfully and can be retrieved', function () {
+            expect(typeRegistryInstance.get('testType').definition.name).toBe('Test Type');
+        });
+
+        it('type registry contains new keys', function () {
+            expect(typeRegistryInstance.listKeys ()).toContain('testType');
+        });
+    });
+});
--- a/src/plugins/plot/src/telemetry/PlotController.js
+++ b/src/plugins/plot/src/telemetry/PlotController.js
@@ -82,6 +82,10 @@ define([
    };

    PlotController.prototype.loadSeriesData = function (series) {
+        if (this.$element[0].offsetWidth === 0) {
+            this.scheduleLoad(series);
+            return;
+        }
        this.startLoading();
        var options = {
            size: this.$element[0].offsetWidth,
@@ -92,6 +96,26 @@ define([
            .then(this.stopLoading.bind(this));
    };

+    PlotController.prototype.scheduleLoad = function (series) {
+        if (!this.scheduledLoads) {
+            this.startLoading();
+            this.scheduledLoads = [];
+            this.checkForSize = setInterval(function () {
+                if (this.$element[0].offsetWidth === 0) {
+                    return;
+                }
+                this.stopLoading();
+                this.scheduledLoads.forEach(this.loadSeriesData, this);
+                delete this.scheduledLoads;
+                clearInterval(this.checkForSize);
+                delete this.checkForSize;
+            }.bind(this));
+        }
+        if (this.scheduledLoads.indexOf(series) === -1) {
+            this.scheduledLoads.push(series);
+        }
+    };
+
    PlotController.prototype.addSeries = function (series) {
        this.listenTo(series, 'change:yKey', function () {
            this.loadSeriesData(series);
@@ -126,6 +150,10 @@ define([
    PlotController.prototype.destroy = function () {
        configStore.untrack(this.config.id);
        this.stopListening();
+        if (this.checkForSize) {
+            clearInterval(this.checkForSize);
+            delete this.checkForSize;
+        }
    };

    PlotController.prototype.loadMoreData = function (range, purge) {
Author	SHA1	Message	Date
Pete Richards	3b5bfb8047	[Plot] Wait for width before loading Plot waits for element to have width before loading. Otherwise, it may make a minmax request with an invalid size parameter. Fixes https://github.com/nasa/openmct/issues/1974	2018-04-03 14:53:49 -07:00
Pete Richards	1a23f2b390	Allow property values of zero. (#1961 ) Allow SWG properties of zero to be used instead of overwriting them with defaults.	2018-03-27 10:02:15 -07:00
Harry	4df6d6141b	[Testing] Create unit tests for Types API (#1890 ) * [Testing] Create unit tests for Tests API * [Documentation] Fix spelling in TypeRegistry.js * update TypeRegistrySpec to conform to code review use .get() on typeRegistryInstance Fixes #1514	2018-03-26 13:28:56 -07:00
Pete Richards	1c97138607	Pin d3 major/minor versoins (#1963 ) Pin to specific d3 major/minor versions while allowing new patches. Previously, we were pinned to major versions only, and minor versions contained changes to the distributed files which would result in broken builds. This should hopefully prevent broken builds from dependency updates.	2018-03-26 11:30:28 -07:00