mirror of
https://github.com/nasa/openmct.git
synced 2025-01-02 19:36:41 +00:00
Merge pull request #1178 from hudsonfoo/open1168
[Frontend] Delay visibility of progress bar
This commit is contained in:
commit
f6ed0e8ab6
@ -19,7 +19,7 @@
|
|||||||
this source code distribution or the Licensing information page available
|
this source code distribution or the Licensing information page available
|
||||||
at runtime from the About dialog for additional information.
|
at runtime from the About dialog for additional information.
|
||||||
-->
|
-->
|
||||||
<div class="abs overlay">
|
<div class="abs overlay" ng-class="{'delayEntry100ms' : ngModel.delay}">
|
||||||
<div class="abs blocker"></div>
|
<div class="abs blocker"></div>
|
||||||
<div class="abs holder">
|
<div class="abs holder">
|
||||||
<a ng-click="ngModel.cancel()"
|
<a ng-click="ngModel.cancel()"
|
||||||
|
@ -200,6 +200,9 @@ define(
|
|||||||
* shown above a progress bar to indicate what's happening.
|
* shown above a progress bar to indicate what's happening.
|
||||||
* @property {number} progress a percentage value (1-100)
|
* @property {number} progress a percentage value (1-100)
|
||||||
* indicating the completion of the blocking task
|
* indicating the completion of the blocking task
|
||||||
|
* @property {boolean} delay adds a brief delay before loading
|
||||||
|
* the dialog. Useful for removing the dialog flicker when the
|
||||||
|
* conditions for displaying the dialog change rapidly.
|
||||||
* @property {string} progressText the message to show below a
|
* @property {string} progressText the message to show below a
|
||||||
* progress bar to indicate progress. For example, this might be
|
* progress bar to indicate progress. For example, this might be
|
||||||
* used to indicate time remaining, or items still to process.
|
* used to indicate time remaining, or items still to process.
|
||||||
|
@ -9,7 +9,8 @@ define([], function () {
|
|||||||
title: "Saving...",
|
title: "Saving...",
|
||||||
hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
|
hint: "Do not navigate away from this page or close this browser tab while this message is displayed.",
|
||||||
unknownProgress: true,
|
unknownProgress: true,
|
||||||
severity: "info"
|
severity: "info",
|
||||||
|
delay: true
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -62,6 +62,9 @@ $ueDesktopMinW: 600px;
|
|||||||
$ovrTopBarH: 45px;
|
$ovrTopBarH: 45px;
|
||||||
$ovrFooterH: 24px;
|
$ovrFooterH: 24px;
|
||||||
$overlayMargin: 25px;
|
$overlayMargin: 25px;
|
||||||
|
/*************** Progress Overlay */
|
||||||
|
$durEntryMs: 50ms;
|
||||||
|
$delayEntryMs: 100ms;
|
||||||
/*************** Items */
|
/*************** Items */
|
||||||
$ueBrowseGridItemLg: 200px;
|
$ueBrowseGridItemLg: 200px;
|
||||||
$ueBrowseGridItemTopBarH: 20px;
|
$ueBrowseGridItemTopBarH: 20px;
|
||||||
|
@ -19,8 +19,17 @@
|
|||||||
* this source code distribution or the Licensing information page available
|
* this source code distribution or the Licensing information page available
|
||||||
* at runtime from the About dialog for additional information.
|
* at runtime from the About dialog for additional information.
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
.overlay {
|
.overlay {
|
||||||
font-size: 90%;
|
font-size: 90%;
|
||||||
|
&.delayEntry100ms {
|
||||||
|
@include keyframes(fadeInFromNone) {
|
||||||
|
0% { display: none; opacity: 0; }
|
||||||
|
100% { display: block; opacity: 1; }
|
||||||
|
}
|
||||||
|
@include animation-delay($delayEntryMs);
|
||||||
|
@include animation(fadeInFromNone $durEntryMs ease-in);
|
||||||
|
}
|
||||||
.blocker {
|
.blocker {
|
||||||
background: $colorOvrBlocker;
|
background: $colorOvrBlocker;
|
||||||
z-index: 100;
|
z-index: 100;
|
||||||
|
Loading…
Reference in New Issue
Block a user