TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1362 from gabsource/fix-sweetalert 

Disable SweetAlert forced focus when a Bootstrap modal is already open in back-end
This commit is contained in:
Samuel Georges 2015-08-15 09:31:23 +10:00
parent b8bc6c6d99 b5577eed25
commit 9ebd084e89
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/assets/vendor/sweet-alert/sweet-alert.js vendored
View File

@ -386,7 +386,13 @@
function handleOnBlur(e) {
var $targetElement = e.target || e.srcElement,
$focusElement = e.relatedTarget,
modalIsVisible = hasClass(modal, 'visible');
modalIsVisible = hasClass(modal, 'visible'),
bootstrapModalIsVisible = document.querySelector('.control-popup.modal') || false;
if(bootstrapModalIsVisible) {
// Bootstrap will enforce focus on the existing model, so don't do anything here to prevent infinite loop
return;
}
if (modalIsVisible) {
var btnIndex = -1; // Find the button - note, this is a nodelist, not an array.