ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 14:48:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed failing tests, and added stopPropagation to prevent maximizing of notifications on action click or dismiss

Browse Source
This commit is contained in:
Henry
2015-10-14 14:08:35 -07:00
parent 1d41939418
commit 912e70d219
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,9 @@
</span>
<a ng-hide="active.notification.primaryAction === undefined"
class="banner-elem l-action s-action"
ng-click="active.notification.primaryAction.action()">
ng-click="action(active.notification.primaryAction.action, $event)">
{{active.notification.primaryAction.label}}
</a>
<a class="banner-elem ui-symbol close" ng-click="dismiss(active.notification)">
<a class="banner-elem ui-symbol close" ng-click="dismiss(active.notification, $event)">
&#x78;</a>
</div>

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

@ -28,7 +28,12 @@ define(
function BannerController($scope, notificationService, dialogService) {
$scope.active = notificationService.active;
$scope.MessageSeverity = MessageSeverity;
$scope.dismiss = function(notification) {
$scope.action = function (action, $event){
$event.stopPropagation();
return action();
}
$scope.dismiss = function(notification, $event) {
$event.stopPropagation();
notificationService.dismissOrMinimize(notification);
};
$scope.maximize = function(notification) {