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

Author: karianna

src/modal/modal.js

@@ -187,6 +187,11 @@ angular.module('ui.bootstrap.modal', [])
           }
         };
 
+        // moved from template to fix issue #2280
+        element.on('click', function(evt) {
+          scope.close(evt);
+        });
+
         // 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}.

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>