data-confirm-modal 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a0e9ea89cbad2ba0d296d89a8aace861403af1
-  data.tar.gz: 461e536d152b506114f72651cd89afa6e5e11be8
+  metadata.gz: 499d44b1254e1733f2c500c502ec93ebaeb2019c
+  data.tar.gz: 40188e1811123f215a49d6e9ab5b1092605e0ccb
 SHA512:
-  metadata.gz: a0e632bbd63b7f5ad39d12f01daab6d7460148c8fc5ac7abafc00cd8fa0b2291a59f8a5534d0c742448f198edd9e125f33a3cb298e7aef61becd7453877d1e86
-  data.tar.gz: ccf22556fd0c3d837de3f89da51335b1e343eff299de6f1decf130a3226ad225a9fb355695d705fd473017f7fe43ee14270ea8b47b884f890a22f814ecfbd682
+  metadata.gz: 06ff311becfd5eca22ccbb8f01af4df98875e07b0aea4cedf42b7730d0d9876d68bbd947b5145958528cfac27e21529741c4b53d4196449fa41b356639cafe3f
+  data.tar.gz: 334261aef657e5fb3ae2b5cb4f717741541ae143403061bcd3115b765a1c323e2066c096a382c790b44609b81f89ae1f024ed70be94ed405255bef36517e039f

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/data-confirm-modal.svg)](https://badge.fury.io/rb/data-confirm-modal)
 
-Uses [Bootstrap's modals](http://twitter.github.io/bootstrap/javascript.html#modals)
+Uses [Bootstrap's modals](https://twitter.github.io/bootstrap/javascript.html#modals)
 in place of the browser's builtin `confirm()` API for links generated through Rails'
 helpers with the `:confirm` option.
 
@@ -18,7 +18,8 @@ Add this line to your application's Gemfile:
 
     gem 'data-confirm-modal'
 
-if you are stuck on Bootstrap 2.3, use the `bootstrap2` branch:
+The library supports Bootstrap 3 and 4. If you are stuck on Bootstrap 2.3, you must
+use the `bootstrap2` branch:
 
     gem 'data-confirm-modal', github: 'ifad/data-confirm-modal', branch: 'bootstrap2'
 
@@ -32,7 +33,7 @@ And then require the Javascript from your `application.js`:
 
 ## Usage
 
-### With Rails ([example](http://jsfiddle.net/zpu4u6mh/))
+### With Rails: [example B3](https://jsfiddle.net/zpu4u6mh/), [example B4](https://jsfiddle.net/02t20nwx/)
 
 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
@@ -68,7 +69,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 ([example](http://jsfiddle.net/ze2Lz8tm/))
+### Without Rails, with data attributes: [example B3](https://jsfiddle.net/nugqscyx/), [example B4](https://jsfiddle.net/0g53ar5n/)
 
 Given an element with `data-confirm` attributes in place, such as
 
@@ -81,7 +82,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 ([example](https://jsfiddle.net/h370g63r/))
+### Without Rails, without data attributes: [example B3](https://jsfiddle.net/h370g63r/), [example B4](https://jsfiddle.net/veg879px/)
 
 Use `dataConfirmModal.confirm()` passing any of the supported options, and pass
 an `onConfirm` and `onCancel` callbacks that'll be invoked when the user clicks
@@ -99,7 +100,7 @@ the confirm or the cancel buttons.
 
 ### Modal Options
 
-The default [bootstrap modal options](http://getbootstrap.com/javascript/#modals-options)
+The default [bootstrap modal options](https://getbootstrap.com/javascript/#modals-options)
 can be passed either via JavaScript or through data attributes.
 
      $('#foo').confirmModal({backdrop: 'static', keyboard: false});
@@ -116,7 +117,7 @@ or
 
 ## Background
 
-Spinned off a corporate [IFAD](http://github.com/ifad/) application in which
+Spinned off a corporate [IFAD](https://github.com/ifad/) application in which
 an user did too much damage because the confirm wasn't *THAT* explicit ... ;-).
 
 ## Contributing

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

@@ -1,3 +1,3 @@
 module DataConfirmModal
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-confirm-modal",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Makes Rails' link_to confirm: 'foo' build a Bootstrap Modal instead of calling the browser's confirm() API.",
   "main": "vendor/assets/javascripts/data-confirm-modal.js",
   "repository": "https://github.com/ifad/data-confirm-modal.git",

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

@@ -89,6 +89,31 @@
 
   dataConfirmModal.restoreDefaults();
 
+  // Detect bootstrap version, or bail out.
+  //
+  if ($.fn.modal == undefined) {
+    throw new Error("The bootstrap modal plugin does not appear to be loaded.");
+  }
+
+  if ($.fn.modal.Constructor == undefined) {
+    throw new Error("The bootstrap modal plugin does not have a Constructor ?!?");
+  }
+
+  if ($.fn.modal.Constructor.VERSION == undefined) {
+    throw new Error("The bootstrap modal plugin does not have its version defined ?!?");
+  }
+
+  var versionString = $.fn.modal.Constructor.VERSION;
+  var match = versionString.match(/^(\d)\./);
+  if (!match) {
+    throw new Error("Cannot identify Bootstrap version. Version string: " + versionString);
+  }
+
+  var bootstrapVersion = parseInt(match[1]);
+  if (bootstrapVersion != 3 && bootstrapVersion != 4) {
+    throw new Error("Unsupported bootstrap version: " + bootstrapVersion + ". data-confirm-modal supports version 3 and 4.");
+  }
+
   var buildElementModal = function (element) {
     var options = {
       title:        element.data('title') || element.attr('title') || element.data('original-title'),
@@ -127,13 +152,32 @@
     var fade = settings.fade ? 'fade' : '';
     var modalClass = options.modalClass ? options.modalClass : settings.modalClass;
 
+    var modalTitle = '<h5 id="'+id+'Label" class="modal-title"></h5> '
+    var modalClose = '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>';
+    var modalHeader;
+
+    // Bootstrap 3 and 4 have different DOMs and different CSS. In B4, the
+    // modalHeader is display:flex and the modalClose uses negative margins,
+    // so it can stay after the modalTitle.
+    //
+    // In B3, the close button floats to the right, so it must stay before
+    // the modalTitle.
+    //
+    switch (bootstrapVersion) {
+    case 3:
+      modalHeader = modalClose + modalTitle;
+      break;
+    case 4:
+      modalHeader = modalTitle + modalClose;
+      break;
+    }
+
     var modal = $(
       '<div id="'+id+'" class="modal '+modalClass+' '+fade+'" tabindex="-1" role="dialog" aria-labelledby="'+id+'Label" aria-hidden="true">' +
         '<div class="modal-dialog" role="document">' +
           '<div class="modal-content">' +
             '<div class="modal-header">' +
-              '<h5 id="'+id+'Label" class="modal-title"></h5> ' +
-              '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>' +
+              modalHeader +
             '</div>' +
             '<div class="modal-body"></div>' +
             '<div class="modal-footer">' +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data-confirm-modal
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Use bootstrap modals with Rails' UJS data-confirm