Compatibility fix for jquery_ujs in Rails (fixes #9).

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.0.1 (2014-07-25)
+
+* Fix compatibility issue with [jquery-ujs](https://github.com/rails/jquery-ujs)
+  (see [issue #9](https://github.com/agoragames/confirm-with-reveal/issues/9)).
+
+## 1.0.0 (2014-03-28)
+
+* Additional UI customization options; plugin-specific confirm/cancel events.
+
 ## 0.0.3 (2014-02-25)
 
 * Fix semantic versioning tag snafu. No functional changes.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "confirm-with-reveal",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "https://github.com/agoragames/confirm-with-reveal",
   "authors": [
     "Jack Letourneau <jletourneau@agoragames.com>"

confirm_with_reveal.coffee

@@ -33,15 +33,21 @@ $.fn.extend
       ok_class: 'button alert'
       cancel: 'Cancel'
       cancel_class: 'button secondary'
+
     settings = $.extend {}, defaults, options
 
     do_confirm = ($el) ->
 
       el_options = $el.data('confirm')
-      el_options ?= {}
+
+      # The confirmation is actually triggered again when hitting "OK"
+      # (or whatever) in the modal (since we clone the original link in),
+      # but since we strip off the 'confirm' data attribute, we can tell
+      # whether this is the first confirmation or a subsequent one.
+      return true if !el_options
 
       if (typeof el_options == 'string') and (el_options.length > 0)
-        return fallback_confirm.call(window, el_options)
+        return ($.rails?.confirm || window.confirm).call(window, el_options)
 
       option = (name) ->
         el_options[name] || settings[name]
@@ -120,19 +126,23 @@ $.fn.extend
 
       return false
 
-    confirm_handler = (e) ->
-      unless (do_confirm $(this))
-        e.preventDefault()
-        e.stopImmediatePropagation()
+    if $.rails
+
+      # We do NOT do the event binding if $.rails exists, because jquery_ujs
+      # has already done it for us
+
+      $.rails.allowAction = (link) -> do_confirm $(link)
+      return $(this)
 
-    fallback_confirm = if $.rails?.confirm then $.rails.confirm else window.confirm
+    else
 
-    if $.rails?.allowAction
-      $.rails.allowAction = (link) ->
-        do_confirm $(link)
+      handler = (e) ->
+        unless (do_confirm $(this))
+          e.preventDefault()
+          e.stopImmediatePropagation()
 
-    return @each () ->
-      $el = $(this)
-      $el.on 'click', 'a[data-confirm], :input[data-confirm]', confirm_handler
-      $el.on 'submit', 'form[data-confirm]', confirm_handler
-      $el
+      return @each () ->
+        $el = $(this)
+        $el.on 'click', 'a[data-confirm], :input[data-confirm]', handler
+        $el.on 'submit', 'form[data-confirm]', handler
+        $el