alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Begun integration of Notifications framework with Charles' code

Browse Source
This commit is contained in:
Henry
2015-10-08 15:08:26 -07:00
parent 4a913376ac
commit 8267058487
8 changed files with 155 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
platform/commonUI/general/res/templates/message-banner.html
View File

@@ -1,12 +1,18 @@
<div class="l-message-banner s-message-banner">
<span class="banner-elem label">
Objects not saved
</span><mct-include key="'progress-bar'"
class="banner-elem"
ng-model="ngModel"
ng-hide-x="ngModel.dialog.progress === undefined"></mct-include><a class="banner-elem l-action s-action">
Try Again
</a><a class="banner-elem ui-symbol close">
&#x78;
</a>
<div ng-controller="BannerController">
<div ng-show="active.notification"
class="l-message-banner s-message-banner">
<span class="banner-elem label">
{{active.notification.title}}
</span><mct-include key="'progress-bar'"
class="banner-elem"
ng-model="ngModel"
ng-hide-x="ngModel.dialog.progress === undefined">
</mct-include>
<a ng-hide="active.notification.progress === undefined"
class="banner-elem l-action s-action">
Try Again
</a>
<a class="banner-elem ui-symbol close">&#x78;</a>
</div>
</div>

2
platform/commonUI/general/src/controllers/BannerController.js
View File

@@ -26,7 +26,7 @@ define(
function () {
"use strict";
function BannerController($scope, notificationService){
$scope.activeNotification = notificationService.active.Notification;
$scope.active = notificationService.active;
}
return BannerController;
});

2
platform/commonUI/notification/bundle.json
View File

@@ -3,7 +3,7 @@
"constants": [
{
"key": "DEFAULT_AUTO_DISMISS",
"value": 2000
"value": 3000
}
],
"services": [

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

@@ -93,8 +93,7 @@ define(
* A context in which to hold the active notification and a
* handle to its timeout.
*/
this.active = {
};
this.active = {};
}
/**
@@ -113,7 +112,7 @@ define(
*/
NotificationService.prototype.success = function (notification) {
notification.autoDismiss = notification.autoDismiss || true;
NotificationService.prototype.notify(notification);
this.notify(notification);
};
/**
@@ -126,7 +125,12 @@ define(
NotificationService.prototype.notify = function (notification) {
/*var notification = new Notification(model),
that=this; */
var that = this;
var that = this,
timeout;
if (notification.autoDismiss === true){
notification.autoDismiss = this.DEFAULT_AUTO_DISMISS;
}
this.notifications.push(notification);
/*
@@ -145,9 +149,12 @@ define(
This notifcation has been added to queue and will be
serviced as soon as possible.
*/
timeout = notification.autoDismiss ?
notification.autoDismiss :
this.DEFAULT_AUTO_DISMISS;
this.active.timeout = this.$timeout(function () {
that.dismissOrMinimize(that.active.notification);
});
}, timeout);
}
};
@@ -171,9 +178,9 @@ define(
*/
if (notification && (notification.autoDismiss
|| this.selectNextNotification())) {
timeout = isNaN(notification.autoDismiss) ?
this.DEFAULT_AUTO_DISMISS :
notification.autoDismiss;
timeout = notification.autoDismiss ?
notification.autoDismiss :
this.DEFAULT_AUTO_DISMISS;
this.active.timeout = this.$timeout(function () {
that.dismissOrMinimize(notification);
@@ -258,5 +265,7 @@ define(
this.dismiss(notification);
}
};
return NotificationService;
});
}
);