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

Commit 508aceb

Browse files
jiniguezchrisirhc
authored andcommitted
fix(modal): fix for conflicts with ngTouch module on mobile devices
- Merge pull request #3044 from jiniguez/fix2280 Conflicts: src/modal/modal.js template/modal/window.html Fixes #2280 Closes #4357
1 parent 745c57d commit 508aceb

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/modal/modal.js

+3
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ angular.module('ui.bootstrap.modal', [])
187187
}
188188
};
189189

190+
// moved from template to fix issue #2280
191+
element.on('click', scope.close);
192+
190193
// This property is only added to the scope for the purpose of detecting when this directive is rendered.
191194
// We can detect that by using this property in the template associated with this directive and then use
192195
// {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.

template/modal/window.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"
22
modal-animation-class="fade"
33
modal-in-class="in"
4-
ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
4+
ng-style="{'z-index': 1050 + index*10, display: 'block'}">
55
<div class="modal-dialog" ng-class="size ? 'modal-' + size : ''"><div class="modal-content" modal-transclude></div></div>
66
</div>

0 commit comments

Comments
 (0)