ama_layout 9.4.1 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5eec21049a6f1660f9786d4d1a0615674d81e2bb
-  data.tar.gz: 8ccc19c0885fc02d09a8a75083ccc61eb2b95800
+  metadata.gz: 44d88e21d02649839bb1d1def73de6fa18c493bc
+  data.tar.gz: b6ffdddd351a0192c5149eef34c3e1eec2f2ac6a
 SHA512:
-  metadata.gz: 97d8fd7d8652dbb53574478c7f6f62208699cb12c579d1bda62ca6abbd52aae5924ff592d124c9b25878ef5d6db384faa6e7ef476925198bc71dd02ea0f98af7
-  data.tar.gz: dd26f7f47189d45689c9f0eb6b2b62ee6203df78dcf6d58979a2714d1f513eb4a836ec5f8f62ec19113a52cf4eacc33fec141039f76c427fc7098bee4b2e6a09
+  metadata.gz: 5555d55e931fe951a9bbe4233e9e4ff80223689416e576201aec4ba38480b7f2a4976cb30bd495430ae3b1137b12364d07159ff1168dd92116b609c08fd1d80f
+  data.tar.gz: 8c40548bf6150847879dcd90ce835b0023db1d45787ce400e4429f5f96ef4cab46136ac41b4059ca7714b2fed0c26b0f745b94fab9ec60f09a297a91a59fe3bd

data/app/assets/javascripts/ama_layout/confirm_modal.js

@@ -2,8 +2,8 @@
   Override the default confirm dialog
   defined by jQuery UJS
 */
-$.rails.allowAction = function(link){
-  if (link.data('confirm') == undefined){
+$.rails.allowAction = function(link) {
+  if (link.data('confirm') == undefined) {
     return true;
   }
   $.rails.showConfirmationDialog(link);
@@ -15,7 +15,7 @@ $.rails.allowAction = function(link){
   Rails doesn't re-trigger the modal. Then
   trigger a click of the link.
 */
-$.rails.confirmed = function(link){
+$.rails.confirmed = function(link) {
   link.data('confirm', null);
   if (link.data('method')){
     // let rails handle non-GET requests
@@ -29,13 +29,19 @@ $.rails.confirmed = function(link){
   Toggle the Foundation reveal modal when a data-confirm
   element is clicked.
 */
-$.rails.showConfirmationDialog = function(link){
+$.rails.showConfirmationDialog = function(link) {
   var el = link.data('confirm');
-  $('[data-' + el + ']').foundation('open');
+  var modal = $('[data-' + el + ']');
+  var key = link.data('reveal-confirm-key');
+  if (key && key.length) {
+    modal.data('reveal-confirm-key', key);
+  }
+  modal.foundation('open');
 }
 
 /*
-  General Usage:
+  Single Link/Single Modal:
+
   Link
   <a href="somewhere" data-confirm="my-data-element">Delete</a>
 
@@ -45,12 +51,31 @@ $.rails.showConfirmationDialog = function(link){
     <a href="#" data-reveal-confirm="my-data-element">OK</a>
     ...
   </div>
+
+  Multiple Links/Single Modal:
+
+  Links
+  <a href="somewhere" data-confirm="my-data-element" data-reveal-confirm-key="element-1">Delete</a>
+  <a href="somewhere-else" data-confirm="my-data-element" data-reveal-confirm-key="element-2">Delete</a>
+
+  Modal
+  <div class="reveal" data-reveal data-my-data-element>
+    ...
+    <a href="#" data-reveal-confirm="my-data-element">OK</a>
+    ...
+  </div>
 */
-$(document).on('click', '*[data-reveal-confirm]', function(e){
+$(document).on('click', '*[data-reveal-confirm]', function(e) {
   e.preventDefault();
-  var el = $(e.currentTarget).data('reveal-confirm');
-  var link = $('[data-confirm="'+ el + '"]');
+  var target = e.currentTarget;
+  var el = $(target).data('reveal-confirm');
   var modal = $('[data-' + el + ']');
+  var key = $(modal).data('reveal-confirm-key');
+  var link = $('[data-confirm="'+ el + '"]');
+  if (key && key.length) {
+    link = $('[data-reveal-confirm-key=' + key + ']');
+  }
   $(modal).foundation('close');
+  $(modal).data('reveal-confirm-key', null);
   $.rails.confirmed(link);
 });

data/lib/ama_layout/version.rb

@@ -1,3 +1,3 @@
 module AmaLayout
-  VERSION = '9.4.1'
+  VERSION = '9.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 9.4.1
+  version: 9.5.0
 platform: ruby
 authors:
 - Michael van den Beuken
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foundation-rails