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

fix(modal): closing breaks on missing scope, 1.4 #3895

Merged
merged 1 commit into from
Jul 5, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 40 additions & 9 deletions src/modal/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,13 @@ angular.module('ui.bootstrap.modal', [])
}
}])

.directive('modalWindow', ['$modalStack', '$q', function ($modalStack, $q) {
.directive('modalWindow', [
'$modalStack', '$q', '$animate',
function ($modalStack , $q , $animate) {
return {
restrict: 'EA',
scope: {
index: '@',
animate: '='
index: '@'
},
replace: true,
transclude: true,
Expand Down Expand Up @@ -119,8 +120,14 @@ angular.module('ui.bootstrap.modal', [])
});

modalRenderDeferObj.promise.then(function () {
// trigger CSS transitions
scope.animate = true;
if (attrs.modalInClass) {
$animate.addClass(element, attrs.modalInClass);

scope.$on($modalStack.WINDOW_CLOSING_EVENT, function (e, setIsAsync) {
var done = setIsAsync();
$animate.removeClass(element, attrs.modalInClass).then(done);
});
}

var inputsWithAutofocus = element[0].querySelectorAll('[autofocus]');
/**
Expand Down Expand Up @@ -169,14 +176,21 @@ angular.module('ui.bootstrap.modal', [])
};
})

.factory('$modalStack', ['$animate', '$timeout', '$document', '$compile', '$rootScope', '$$stackedMap',
function ($animate, $timeout, $document, $compile, $rootScope, $$stackedMap) {
.factory('$modalStack', [
'$animate', '$timeout', '$document', '$compile', '$rootScope',
'$q',
'$$stackedMap',
function ($animate , $timeout , $document , $compile , $rootScope ,
$q,
$$stackedMap) {

var OPENED_MODAL_CLASS = 'modal-open';

var backdropDomEl, backdropScope;
var openedWindows = $$stackedMap.createNew();
var $modalStack = {};
var $modalStack = {
WINDOW_CLOSING_EVENT: 'modal.stack.window-closing'
};

function backdropIndex() {
var topBackdropIndex = -1;
Expand All @@ -203,8 +217,25 @@ angular.module('ui.bootstrap.modal', [])
//clean up the stack
openedWindows.remove(modalInstance);

var closingDeferred;
var closingPromise;
var setIsAsync = function () {
if (!closingDeferred) {
closingDeferred = $q.defer();
closingPromise = closingDeferred.promise;
}

return function () {
closingDeferred.resolve();
};
};
modalWindow.modalScope.$broadcast($modalStack.WINDOW_CLOSING_EVENT, setIsAsync);

//remove window DOM element
removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
$q.when(closingPromise).then(function() {
modalWindow.modalDomEl.remove();
modalWindow.modalScope.$destroy();

body.toggleClass(OPENED_MODAL_CLASS, openedWindows.length() > 0);
checkRemoveBackdrop();
});
Expand Down
4 changes: 2 additions & 2 deletions src/modal/test/modal.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,19 @@ describe('$modal', function () {

function close(modal, result, noFlush) {
var closed = modal.close(result);
$rootScope.$digest();
if (!noFlush) {
$timeout.flush();
}
$rootScope.$digest();
return closed;
}

function dismiss(modal, reason, noFlush) {
var closed = modal.dismiss(reason);
$rootScope.$digest();
if (!noFlush) {
$timeout.flush();
}
$rootScope.$digest();
return closed;
}

Expand Down
3 changes: 2 additions & 1 deletion template/modal/window.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"
modal-animation-class="fade"
ng-class="{in: animate}" ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
modal-in-class="in"
ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
<div class="modal-dialog" ng-class="size ? 'modal-' + size : ''"><div class="modal-content" modal-transclude></div></div>
</div>