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
josetaira 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
Prev Previous commit
Next Next commit
fix(modal): fix formatting comments 
Fix the formatting comments of wesleycho on recent commit for modal fix

Closes #5670
  • Loading branch information
@josetaira
josetaira committed Apr 4, 2016
commit 40f3df97e3add19ad7fe69116a7e3e3eaf92c3be
6 changes: 3 additions & 3 deletions src/modal/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p

// If any backdrop exist, ensure that it's index is always
// right below the top modal
if(topBackdropIndex > -1 && topBackdropIndex < topModalIndex) {
if (topBackdropIndex > -1 && topBackdropIndex < topModalIndex) {
topBackdropIndex = topModalIndex;
}
return topBackdropIndex;
Expand All @@ -302,8 +302,8 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap', 'ui.bootstrap.p
//clean up the stack
openedWindows.remove(modalInstance);
previousTopOpenedModal = openedWindows.top();
if(previousTopOpenedModal) {
topModalIndex = parseInt(previousTopOpenedModal.value.modalDomEl.attr("index"), 10);
if (previousTopOpenedModal) {
topModalIndex = parseInt(previousTopOpenedModal.value.modalDomEl.attr('index'), 10);
}

removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
Expand Down