From 8f475d90cf26cd1dfb94e9a79ae89f980ea360bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20I=C3=B1iguez=20de=20Heredia?= <jon.iniguez@gmail.com>
Date: Tue, 2 Dec 2014 23:41:17 +0100
Subject: [PATCH] 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
---
 src/modal/modal.js         | 3 +++
 template/modal/window.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modal/modal.js b/src/modal/modal.js
index 84fc6bec86..a1359b81c4 100644
--- a/src/modal/modal.js
+++ b/src/modal/modal.js
@@ -187,6 +187,9 @@ angular.module('ui.bootstrap.modal', [])
           }
         };
 
+        // moved from template to fix issue #2280
+        element.on('click', scope.close);
+
         // This property is only added to the scope for the purpose of detecting when this directive is rendered.
         // We can detect that by using this property in the template associated with this directive and then use
         // {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.
diff --git a/template/modal/window.html b/template/modal/window.html
index 0bb4f964b6..2efdd0fe24 100644
--- a/template/modal/window.html
+++ b/template/modal/window.html
@@ -1,6 +1,6 @@
 <div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"
     modal-animation-class="fade"
     modal-in-class="in"
-	ng-style="{'z-index': 1050 + index*10, display: 'block'}" ng-click="close($event)">
+    ng-style="{'z-index': 1050 + index*10, display: 'block'}">
     <div class="modal-dialog" ng-class="size ? 'modal-' + size : ''"><div class="modal-content" modal-transclude></div></div>
 </div>