Merge pull request angular-ui#3044 from jiniguez/fix2280

fix(modal): fix for conflicts with ngTouch module on mobile devices
yarl · Jan 8, 2015 · f671e02 · f671e02
2 parents eec68d8 + 722036c
commit f671e02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/modal/modal.js b/src/modal/modal.js
@@ -91,6 +91,11 @@ angular.module('ui.bootstrap.modal', ['ui.bootstrap.transition'])
         element.addClass(attrs.windowClass || '');
         scope.size = attrs.size;
 
+        // moved from template to fix issue #2280
+        element.on('click', function(evt) {
+          scope.close(evt);
+        });
+
         $timeout(function () {
           // trigger CSS transitions
           scope.animate = true;

diff --git a/template/modal/window.html b/template/modal/window.html
@@ -1,3 +1,3 @@
-<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
+<div tabindex="-1" role="dialog" class="modal fade" ng-class="{in: animate}" ng-style="{'z-index': 1050 + index*10, display: 'block'}">
     <div class="modal-dialog" ng-class="{'modal-sm': size == 'sm', 'modal-lg': size == 'lg'}"><div class="modal-content" modal-transclude></div></div>
 </div>