ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-19 07:38:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[Notifications] Remove custom autoDismiss

Browse Source
This commit is contained in:
Alex M
2016-10-29 11:18:07 +03:00
parent c9ac85089a
commit d63c401e44
2 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/commonUI/notification/src/NotificationService.js
View File

@ -61,7 +61,7 @@ define(
* @property {boolean} [unknownProgress] a boolean indicating that the
* progress of the underlying task is unknown. This will result in a
* visually distinct progress bar.
* @property {boolean | number} [autoDismiss] If truthy, dialog will
* @property {boolean} [autoDismiss] If truthy, dialog will
* be automatically minimized or dismissed (depending on severity).
* Additionally, if the provided value is a number, it will be used
* as the delay period before being dismissed.
@ -384,9 +384,7 @@ define(
* @private
*/
NotificationService.prototype.setActiveNotification = function (notification) {
var timeout;
var shouldAutoDismiss;
var usesCustomTimeout;
this.active.notification = notification;
if (!notification) {
@ -394,19 +392,16 @@ define(
return;
}
usesCustomTimeout = typeof notification.model.autoDismiss === "number";
if (notification.model.severity === "info" || usesCustomTimeout) {
if (notification.model.severity === "info") {
shouldAutoDismiss = true;
} else {
shouldAutoDismiss = notification.model.autoDismiss;
}
if (shouldAutoDismiss || this.selectNextNotification()) {
timeout = usesCustomTimeout ? notification.model.autoDismiss : this.AUTO_DISMISS_TIMEOUT;
this.active.timeout = this.$timeout(function () {
notification.dismissOrMinimize();
}, timeout);
}, this.AUTO_DISMISS_TIMEOUT);
} else {
delete this.active.timeout;
}