External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-18 06:47:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Prevent clicks outside of prompt modal from closing the modal without saving. User will now need to explicity hit the X or Cancel buttons to close the modal prematurely.

Browse Source
This commit is contained in:
mabashian
2019-07-30 15:22:01 -04:00
parent 6499f2b233
commit 47c59d5211
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/client/lib/components/modal/modal.directive.js
View File

@@ -33,18 +33,23 @@ function AtModalController ($timeout, eventService, strings) {
vm.modal.title = title; vm.modal.title = title;
vm.modal.message = message; vm.modal.message = message;
listeners = eventService.addListeners([ if (!vm.modal.preventOutsideClick) {
[overlay, 'click', vm.clickToHide] listeners = eventService.addListeners([
]); [overlay, 'click', vm.clickToHide]
]);
}
overlay.style.display = 'block'; overlay.style.display = 'block';
overlay.style.opacity = 1; overlay.style.opacity = 1;
}; };
vm.hide = () => { vm.hide = () => {
console.log('hide');
overlay.style.opacity = 0; overlay.style.opacity = 0;
eventService.remove(listeners); if (!vm.modal.preventOutsideClick) {
eventService.remove(listeners);
}
setTimeout(() => { setTimeout(() => {
overlay.style.display = 'none'; overlay.style.display = 'none';

2
awx/ui/client/src/templates/prompt/prompt.controller.js
View File

@@ -13,6 +13,8 @@ export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings', '$f
scope = _scope_; scope = _scope_;
({ modal } = scope[scope.ns]); ({ modal } = scope[scope.ns]);
modal.preventOutsideClick = true;
scope.$watch('vm.promptData.triggerModalOpen', () => { scope.$watch('vm.promptData.triggerModalOpen', () => {
vm.actionButtonClicked = false; vm.actionButtonClicked = false;
if(vm.promptData && vm.promptData.triggerModalOpen) { if(vm.promptData && vm.promptData.triggerModalOpen) {