Fixes issue with backdrop click closing

jensljungblad · Jan 7, 2015 · 936afa4 · 936afa4
1 parent 34d3dd3
commit 936afa4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/micro-modal.js b/micro-modal.js
@@ -19,7 +19,7 @@
   };
 
   initialize = function(options) {
-    var $modal, $modalDialog;
+    var $modal;
     options = $.extend({
       backdrop: true,
       keyboard: true,
@@ -32,12 +32,10 @@
     if (options.vertical) {
       $modal.addClass('modal-vertical');
     }
-    $modal.on('click', function(e) {
-      return close.apply(this);
-    });
-    $modalDialog = $modal.children('.modal-dialog');
-    return $modalDialog.on('click', function(e) {
-      return e.stopPropagation();
+    return $modal.on('click', function(e) {
+      if (e.target === e.currentTarget) {
+        return close.apply(this);
+      }
     });
   };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "micro-modal",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Jens Ljungblad",
   "devDependencies": {
     "gulp": "~3.8.8",

diff --git a/source/micro-modal.coffee b/source/micro-modal.coffee
@@ -22,12 +22,13 @@ initialize = (options) ->
   $modal.addClass 'modal-vertical' if options.vertical
 
   # Close modal when clicking the backdrop
-  $modal.on 'click', (e) -> close.apply this
+  $modal.on 'click', (e) ->
+    close.apply this if e.target is e.currentTarget
 
-  $modalDialog = $modal.children '.modal-dialog'
-
-  # Prevent closing modal when clicking the dialog
-  $modalDialog.on 'click', (e) -> e.stopPropagation()
+  # $modalDialog = $modal.children '.modal-dialog'
+  #
+  # # Prevent closing modal when clicking the dialog
+  # $modalDialog.on 'click', (e) -> e.stopPropagation()
 
 open = ->
   $(this).addClass 'modal-open'