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

Merge remote-tracking branch 'origin/master' into frontend-1047

Browse Source
This commit is contained in:
Charles Hacskaylo
2016-07-21 08:53:23 -07:00
parent 9d9cabb760 14f1a1f740
commit 883f999215
21 changed files with 636 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,17 +54,17 @@ define(
};
$scope.maximize = function (notification) {
if (notification.model.severity !== "info") {
var dialog;
notification.model.cancel = function () {
dialogService.dismiss();
dialog.dismiss();
};
//If the notification is dismissed by the user, close
// the dialog.
notification.onDismiss(function () {
dialogService.dismiss();
dialog.dismiss();
});
dialogService.showBlockingMessage(notification.model);
dialog = dialogService.showBlockingMessage(notification.model);
}
};
}

4
platform/commonUI/general/src/controllers/ClickAwayController.js
View File

@ -34,7 +34,7 @@ define(
* @param $scope the scope in which this controller is active
* @param $document the document element, injected by Angular
*/
function ClickAwayController($document, $timeout) {
function ClickAwayController($document, $scope) {
var self = this;
this.state = false;
@ -44,7 +44,7 @@ define(
// `clickaway` action occurs after `toggle` if `toggle` is
// triggered by a click/mouseup.
this.clickaway = function () {
$timeout(function () {
$scope.$apply(function () {
self.deactivate();
});
};