ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-19 11:17:04 +00:00
Code Issues Actions 9 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles.json
View File

@ -5,12 +5,12 @@
"platform/commonUI/about",
"platform/commonUI/browse",
"platform/commonUI/edit",
"platform/commonUI/notification",
"platform/commonUI/dialog",
"platform/commonUI/general",
"platform/commonUI/inspect",
"platform/commonUI/mobile",
"platform/commonUI/themes/espresso",
"platform/commonUI/notification",
"platform/containment",
"platform/execution",
"platform/telemetry",

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) {

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

@ -34,7 +34,8 @@
],
"indicators": [
{
"implementation": "NotificationIndicator.js"
"implementation": "NotificationIndicator.js",
"priority": "fallback"
}
],
"services": [

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

@ -180,7 +180,7 @@ define(
notifications queued for display, setup a timeout to
dismiss the dialog.
*/
if (notification && (notification.autoDismiss !== false
if (notification && (notification.autoDismiss
|| this.selectNextNotification())) {
timeout = notification.autoDismiss || this.DEFAULT_AUTO_DISMISS;

6
testing/dialogTest/bundle.json
View File

@ -34,10 +34,12 @@
],
"indicators": [
{
"implementation": "DialogLaunchIndicator.js"
"implementation": "DialogLaunchIndicator.js",
"priority": "fallback"
},
{
"implementation": "NotificationLaunchIndicator.js"
"implementation": "NotificationLaunchIndicator.js",
"priority": "fallback"
}
]
}