Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

fix(modal): ensure correct index is set for new modals #5733

Closed
wants to merge 5 commits into from
Closed

fix(modal): ensure correct index is set for new modals #5733

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a436de
fix(modal): ensure correct index is set for new modals
Apr 4, 2016
40f3df9
fix(modal): fix formatting comments
josetaira Apr 4, 2016
8c55c6e
fix(modal): add code to adjust index for modal
Apr 5, 2016
e08b5f5
fix(modals): add unit test and add missing line
Apr 5, 2016
4ca026a
fix(modal): fix CI failed checks for parseInt
Apr 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/modal/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p
var $modalStack = {
NOW_CLOSING_EVENT: 'modal.stack.now-closing'
};
var topModalIndex = 0;
var previousTopOpenedModal = null;

//Modal focus behavior
var tabableSelector = 'a[href], area[href], input:not([disabled]), ' +
Expand All @@ -278,6 +280,12 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p
topBackdropIndex = i;
}
}

// If any backdrop exist, ensure that it's index is always
// right below the top modal
if(topBackdropIndex > -1 && topBackdropIndex < topModalIndex) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a space after if

topBackdropIndex = topModalIndex;
}
return topBackdropIndex;
}

Expand All @@ -293,6 +301,10 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p

//clean up the stack
openedWindows.remove(modalInstance);
previousTopOpenedModal = openedWindows.top();
if(previousTopOpenedModal) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

topModalIndex = parseInt(previousTopOpenedModal.value.modalDomEl.attr("index"), 10);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use single quotes.

}

removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
var modalBodyClass = modalWindow.openedClass || OPENED_MODAL_CLASS;
Expand Down