data-confirm-modal 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51553390f46b33fab5ef7c510383311e3e4b0c16
-  data.tar.gz: 09d08afd86829132cf63712585b2811257f9d1e3
+  metadata.gz: 036d8ef59a741d41fdde8be51c5133108deda949
+  data.tar.gz: 78e832d68393925aeff5e1643159dc338b76c615
 SHA512:
-  metadata.gz: 8bd8a34f895f5c63f91a311b09112b84e76f015c3e25badcd22be4206711a24bef5f8a8706af1cdd7830d02f453e6fc271e352c59c2951324ef284922b084e74
-  data.tar.gz: da1dfe1a0a3675cd235da276e51ad9d931c81c5e2bdd8adb0a69b8dcf7d5145bef0dfb8458dd2672d4fea0c7d3dfe5a447f84123d55d8b7853164adfb3eba1ff
+  metadata.gz: 252e3c3a9d9fd2eb9c5a450ae7d3cc100f3ddb6a50778e1a75a45583a48dba3eebf29c49c4781fdd0db1a4983e3e6fb095569a4b14d73e8a28743b846ef41442
+  data.tar.gz: 27e3cddc2965780e9a74a216b6510e75008f14c42e60407a2d799e45f2dc6025a6a92ece54fb0a5cad70c6bc7d6620cafda18faf996c1d3b3f39089b37a6f871

data/README.md

@@ -30,7 +30,7 @@ And then require the Javascript from your `application.js`:
 
 ## Usage
 
-### With Rails
+### With Rails ([example](http://jsfiddle.net/zpu4u6mh/))
 
 By default, the Gem's Javascript overrides Rails' [data-confirm behaviour][]
 for you, with no change required to your code. The modal is applicable to
@@ -67,7 +67,7 @@ To restore default settings use `dataConfirmModal.restoreDefaults()`.
 
 [data-confirm-behaviour]: http://api.rubyonrails.org/classes/ActionView/Helpers/UrlHelper.html
 
-### Without Rails, with data attributes
+### Without Rails, with data attributes ([example](http://jsfiddle.net/ze2Lz8tm/))
 
 Given an element with `data-confirm` attributes in place, such as
 
@@ -80,7 +80,7 @@ you can then invoke `.confirmModal()` on it using:
 that'll display the confirmation modal. If the user confirms, then the `#foo`
 link will receive a `click` event.
 
-### Without Rails, without data attributes
+### Without Rails, without data attributes ([example](https://jsfiddle.net/h370g63r/))
 
 Use `dataConfirmModal.confirm()` passing any of the supported options, and pass
 an `onConfirm` and `onCancel` callbacks that'll be invoked when the user clicks
@@ -96,8 +96,6 @@ the confirm or the cancel buttons.
       onCancel:  function() { alert('cancelled') }
     });
 
-A live jsfiddle example is [available here](http://jsfiddle.net/t0m7ayr3/).
-
 ### Modal Options
 
 The default [bootstrap modal options](http://getbootstrap.com/javascript/#modals-options)

data/data-confirm-modal.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/ifad/data-confirm-modal"
   s.summary     = "Use bootstrap modals with Rails' UJS data-confirm"
   s.description = "This gem overrides Rails' UJS behaviour to open up a Bootstrap Modal instead of the browser's built in confirm() dialog"
-  s.licenses    = "MIT"
 
   s.required_rubygems_version = ">= 1.3.6"
 

data/lib/data-confirm-modal/version.rb

@@ -1,3 +1,3 @@
 module DataConfirmModal
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/vendor/assets/javascripts/data-confirm-modal.js

@@ -111,10 +111,10 @@
 
     var modal = buildModal(options);
 
-    modal.data('confirmed', false);
     modal.find('.commit').on('click', function () {
-      modal.data('confirmed', true);
-      element.trigger('click');
+      // Call the original event handler chain
+      element.get(0).click();
+
       modal.modal('hide');
     });
 
@@ -239,43 +239,63 @@
    * caching it into the element's `confirm-modal` data attribute.
    */
   var getModal = function (element) {
-    var modal = element.data('confirm-modal') || buildElementModal(element);
+    var modal = element.data('confirm-modal');
 
-    if (modal && !element.data('confirm-modal'))
+    if (!modal) {
+      modal = buildElementModal(element);
       element.data('confirm-modal', modal);
+    }
 
     return modal;
   };
 
   $.fn.confirmModal = function () {
-    getModal($(this)).spawn();
+    var modal = getModal($(this));
+
+    modal.spawn();
 
-    return this;
+    return modal;
   };
 
   if ($.rails) {
     /**
-     * Attaches to the Rails' UJS adapter 'confirm' event on links having a
-     * `data-confirm` attribute. Temporarily overrides the `$.rails.confirm`
-     * function with an anonymous one that returns the 'confirmed' status of
-     * the modal.
+     * Attaches to Rails' UJS adapter's 'confirm' event, triggered on elements
+     * having a `data-confirm` attribute set.
+     *
+     * If the modal is not visible, then it is spawned and the default Rails
+     * confirmation dialog is canceled.
+     *
+     * If the modal is visible, it means the handler is being called by the
+     * modal commit button click handler, as such the user has successfully
+     * clicked on the confirm button. In this case Rails' confirm function
+     * is briefly overriden, and afterwards reset when the modal is closed.
      *
-     * A modal is considered 'confirmed' when an user has successfully clicked
-     * the 'confirm' button in it.
      */
+    var rails_confirm = $.rails.confirm;
+
     $(document).delegate(settings.elements.join(', '), 'confirm', function() {
       var element = $(this), modal = getModal(element);
-      var confirmed = modal.data('confirmed');
 
-      if (!confirmed && !modal.is(':visible')) {
+      if (!modal.is(':visible')) {
         modal.spawn();
 
-        var confirm = $.rails.confirm;
-        $.rails.confirm = function () { return modal.data('confirmed'); }
-        modal.on('hide', function () { $.rails.confirm = confirm; });
-      }
+        // Cancel Rails' confirmation
+        return false;
 
-      return confirmed;
+      } else {
+        // Modal has been confirmed. Override Rails' handler
+        $.rails.confirm = function () {
+          return true;
+        }
+
+        modal.one('hidden.bs.modal', function() {
+          // Reset it after modal is closed.
+          $.rails.confirm = rails_confirm;
+        });
+
+        // Proceed with Rails' handlers
+        return true;
+      }
     });
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data-confirm-modal
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -43,8 +43,7 @@ files:
 - lib/data-confirm-modal/version.rb
 - vendor/assets/javascripts/data-confirm-modal.js
 homepage: http://github.com/ifad/data-confirm-modal
-licenses:
-- MIT
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -62,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Use bootstrap modals with Rails' UJS data-confirm