clicking on the modal overlay (masking layer) no longer closes the mo…

…dals by default -- use the allowHideUsingOverlay option if you need that behavior now.
swistak · Nov 12, 2011 · 20b0767 · 20b0767
1 parent e0ae319
commit 20b0767
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/spec/javascripts/mercury/modal_spec.js.coffee b/spec/javascripts/mercury/modal_spec.js.coffee
@@ -146,13 +146,21 @@ describe "Mercury.modal", ->
         Mercury.trigger('resize')
         expect(spy.callCount).toEqual(1)
 
-    describe "clicking on the overlay", ->
+    describe "clicking on the overlay (options.allowHideUsingOverlay = true)", ->
 
       it "calls hide", ->
+        Mercury.modal.options.allowHideUsingOverlay = true
         spy = spyOn(Mercury.modal, 'hide').andCallFake(=>)
         jasmine.simulate.click($('.mercury-modal-overlay').get(0))
         expect(spy.callCount).toEqual(1)
 
+    describe "clicking on the overlay (options.allowHideUsingOverlay = false)", ->
+
+      it "doesn't call hide", ->
+        spy = spyOn(Mercury.modal, 'hide').andCallFake(=>)
+        jasmine.simulate.click($('.mercury-modal-overlay').get(0))
+        expect(spy.callCount).toEqual(0)
+
     describe "clicking on the close button", ->
 
       it "calls hide", ->

diff --git a/vendor/assets/javascripts/mercury/modal.js.coffee b/vendor/assets/javascripts/mercury/modal.js.coffee
@@ -40,7 +40,7 @@ jQuery.extend Mercury.modal, {
     Mercury.bind 'refresh', => @resize(true)
     Mercury.bind 'resize', => @position()
 
-    @overlay.click => @hide()
+    @overlay.click => @hide() if @options.allowHideUsingOverlay
 
     @titleElement.find('a').click => @hide()