data-confirm-modal 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1422b45ab15ba70a478143ec995ed048c0d82440
-  data.tar.gz: 34d358ad953ff69f7512e95c47ffdd196dc8a9b7
+SHA256:
+  metadata.gz: c9bc7acb32dac28c104e638a0801893d596d45ea874a06d96f206bd6993c7984
+  data.tar.gz: 7297704438cc52582a7a6549dd2f7c9539f3eacfbe5461477a66498f864415f9
 SHA512:
-  metadata.gz: 19683e409abb034d2b3e433f0fd6c2bd800eec58916362378d19c5e19a8d49cc75e114bc3ba412c45c92a6a683febfd4cadb4198d54503fe65a0b47b3ed795ae
-  data.tar.gz: f880065ef14bf87900c851cea6e08dee9e6115f3ccb293a237230c3d2a1756e4f6803343f5204dc3da05797c7049e95729bf534b44a93be4c204ddc39c58e2c5
+  metadata.gz: cf8b6b409d8a7be071c1bd79233c44a5218ff5594fb1f8548109e92b18b5a5df9c08a3d8532b0862ee9b6c243a1a2d33defce8a8c7d1a08638e9f20db7713b02
+  data.tar.gz: f204f58dd28b34bc3fb0f0b38695f5793379d52978748b284559a08d4c5c8f83e4827ed33cc105e61c43dcc4fce7c25be2c5c858bef8d3f320144926bc6962ab

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

@@ -1,3 +1,3 @@
 module DataConfirmModal
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

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

@@ -47,6 +47,7 @@
     focus: 'commit',
     zIndex: 1050,
     modalClass: false,
+    modalCloseContent: '×',
     show: true
   };
 
@@ -116,23 +117,24 @@
 
   var buildElementModal = function (element) {
     var options = {
-      title:        element.data('title') || element.attr('title') || element.data('original-title'),
-      text:         element.data('confirm'),
-      focus:        element.data('focus'),
-      method:       element.data('method'),
-      modalClass:   element.data('modal-class'),
-      commit:       element.data('commit'),
-      commitClass:  element.data('commit-class'),
-      cancel:       element.data('cancel'),
-      cancelClass:  element.data('cancel-class'),
-      remote:       element.data('remote'),
-      verify:       element.data('verify'),
-      verifyRegexp: element.data('verify-regexp'),
-      verifyLabel:  element.data('verify-text'),
+      title:             element.data('title') || element.attr('title') || element.data('original-title'),
+      text:              element.data('confirm'),
+      focus:             element.data('focus'),
+      method:            element.data('method'),
+      modalClass:        element.data('modal-class'),
+      modalCloseContent: element.data('modal-close-content'),
+      commit:            element.data('commit'),
+      commitClass:       element.data('commit-class'),
+      cancel:            element.data('cancel'),
+      cancelClass:       element.data('cancel-class'),
+      remote:            element.data('remote'),
+      verify:            element.data('verify'),
+      verifyRegexp:      element.data('verify-regexp'),
+      verifyLabel:       element.data('verify-text'),
       verifyRegexpCaseInsensitive: element.data('verify-regexp-caseinsensitive'),
-      backdrop:     element.data('backdrop'),
-      keyboard:     element.data('keyboard'),
-      show:         element.data('show')
+      backdrop:          element.data('backdrop'),
+      keyboard:          element.data('keyboard'),
+      show:              element.data('show')
     };
 
     var modal = buildModal(options);
@@ -152,8 +154,10 @@
     var fade = settings.fade ? 'fade' : '';
     var modalClass = options.modalClass ? options.modalClass : settings.modalClass;
 
+    var modalCloseContent = options.modalCloseContent ? options.modalCloseContent : settings.modalCloseContent;
+    var modalClose = '<button type="button" class="close" data-dismiss="modal" aria-hidden="true">'+modalCloseContent+'</button>'
+
     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
@@ -190,7 +194,8 @@
     );
 
     // Make sure it's always the top zindex
-    var highest = current = settings.zIndex;
+    var highest, current;
+    highest = current = settings.zIndex;
     $('.modal.in').not('#'+id).each(function() {
       current = parseInt($(this).css('z-index'), 10);
       if(current > highest) {
@@ -283,8 +288,8 @@
    * Returns a modal already built for the given element or builds a new one,
    * caching it into the element's `confirm-modal` data attribute.
    */
-  var getModal = function (element) {
-    var modal = element.data('confirm-modal');
+  $.fn.getConfirmModal = function () {
+    var element = $(this), modal = element.data('confirm-modal');
 
     if (!modal) {
       modal = buildElementModal(element);
@@ -295,7 +300,7 @@
   };
 
   $.fn.confirmModal = function () {
-    var modal = getModal($(this));
+    var modal = $(this).getConfirmModal();
 
     modal.spawn();
 
@@ -319,7 +324,7 @@
     var window_confirm = window.confirm;
 
     $(document).delegate(settings.elements.join(', '), 'confirm', function() {
-      var element = $(this), modal = getModal(element);
+      var modal = $(this).getConfirmModal();
 
       if (!modal.is(':visible')) {
         modal.spawn();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data-confirm-modal
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Marcello Barnaba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -64,8 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Use bootstrap modals with Rails' UJS data-confirm