jqr-helpers 1.0.45 → 1.0.46

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWMxMGYwMjg3MDc1MWFlZmJkMmQwMzljYWJmYzdhYjc3YjQxNjg3Yg==
+    NGJmMTIyNTRmNmMxNWMwOWU2YjAzZDZjMTIwOWUwYWE2ZjEyMmIzNg==
   data.tar.gz: !binary |-
-    M2RmZTM4YzEyZGUxNzAwYTg2YTI4NDhkMzBlYjJjMzVmODMwNmE5Zg==
+    MTY4ZDljZGFkZGE4ODc1M2ZlNzc2NGM5YTc0MDI2ZTVkZTk4ODJlNg==
 SHA512:
   metadata.gz: !binary |-
-    ZWI5YzMxYmJiMmIyYjA2YTY2NTQxMzY2MTU3ZTVhN2M4ZWQ2OGY4OTkxODY1
-    ODU1OGJjMGJiYjEzMzY0ZTkyM2U2NWRlNTgwZDRjNGFlNGFhOTcwZGJmMDBj
-    ZDY2NWE4ZGZjOWQxOGE3MGNhMDc3ODY4NWRhZGUwYjljZDQ3YzE=
+    NmQ2NDk0NDlkMjgzNTliZjk1NGNmMDAwMzdjMjE1OWFjOGU4OGMyYmY1Mjll
+    YTI5ODEzMGJjODQ2ZTM1ODg5YTYyNTlhYWQ0N2RkZTViYThmYmMxODE0ZDNi
+    MTgzN2U4NDQ4YzMyOGMwN2RmNjc3YTBkYzU2Y2QwODNiNjEwMzQ=
   data.tar.gz: !binary |-
-    NjRlZGMwZGQxYjI0MDAyZTU1ZTc2MTg1ZTU4M2U5ZDZiN2UwY2EwYWQ4M2E2
-    MTM2MGQxYjUzOGNkOTJmNmYwOTIxM2Q4MzQ4OWVhOTYyMjMzNzVmZjg0NDY1
-    MWFkZWNjNjU2MDU2NjMxYjBlYzdiZDkxNzZmZTUwY2EyODkzYjM=
+    ZmM0MDg5OWQxNGI1NzY3M2UxZDZjMTU0YTYzNjVjMWY2NGQwOGZlMWE0YWFk
+    OGEyMDM4MTYxNGQ4MTBhYzljNGI2MTQzMTk2ZWJkYTY5MDNlZTM5ZmFlYzAx
+    OTdlMzI5OWI0NDRmMjA0MmUxZTc5M2RmNTYzM2IyNmI3NThjNjk=

data/app/assets/javascripts/jqr-helpers.js

@@ -22,7 +22,6 @@
     $(element).removeAttr('disabled');
   }
 
-  var ujsDialogElement = null; // the element that opened the dialog
   var ujsSubmitElement = null; // the element that submitted a form
 
   // called from dialog button value
@@ -30,12 +29,17 @@
     $('.ui-dialog:visible form').first().submit();
   }
 
+  function findDialog(element) {
+    var dialog = $(element).closest('.ui-dialog-content');
+    if (dialog.length == 0) dialog = $(element).find('.ui-dialog-content');
+    if (dialog.length == 0) dialog = $(element).prev('.ui-dialog-content');
+    return dialog;
+  }
+
   // called from dialog button value
   // uses $.proxy to set the "this" context
   function ujsDialogClose() {
-    var dialog = $(this).closest('.ui-dialog-content');
-    if (dialog.length == 0) dialog = $(this).find('.ui-dialog-content');
-    if (dialog.length == 0) dialog = $(this).prev('.ui-dialog-content');
+    var dialog = findDialog(this);
     if (dialog.data('remote-dialog')) {
       dialog.dialog('destroy').remove();
     }
@@ -65,7 +69,8 @@
   }
 
   function ujsDialogClick(event) {
-    ujsDialogElement = $(this);
+    $(this).uniqueId();
+    var dialogClickID = $(this).prop('id');
     var dialogID = $(this).data('dialog-id');
     var dialogElement = $('#' + dialogID);
     if (dialogID == 'next') dialogElement = $(this).next();
@@ -117,7 +122,7 @@
     if (url) {
       $(this).trigger('jqr.beforedialogopen');
       $(document.body).append('<div class="ui-widget-overlay ui-front">');
-      showThrobber(ujsDialogElement);
+      showThrobber($('#' + dialogClickID));
       var closeX = $(this).data('close-x');
       if (dialogElement.length == 0) {
         $('body').append("<div id='" + dialogID + "'>");
@@ -134,9 +139,10 @@
                 dialogElement.find('.ujs-dialog-title-hidden').text();
         }
         $('.ui-widget-overlay').remove();
-        hideThrobber(ujsDialogElement);
+        hideThrobber($('#' + dialogClickID));
         $('#ujs-dialog-throbber').remove();
         $(this).dialog(dialogOptions);
+        $(this).data('dialog-opener', dialogClickID);
         $(dialogElement).trigger('jqr.load');
       });
     }
@@ -230,8 +236,10 @@
     // if this was sent from a dialog, close the dialog and look at the
     // element that opened it for update/append/delete callbacks.
     if ($('.ui-dialog:visible').length) {
-      if (element.data('use-dialog-opener'))
-        targetElement = ujsDialogElement;
+      if (element.data('use-dialog-opener')) {
+        var dialog = findDialog(this);
+        targetElement = $('#' + dialog.data('dialog-opener'));
+      }
       if (element.data('close-dialog'))
         ujsDialogClose.call(element);
     }

data/jqr-helpers.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = 'jqr-helpers'
   s.require_paths = %w(. lib lib/jqr-helpers)
-  s.version      = '1.0.45'
+  s.version      = '1.0.46'
   s.date         = '2014-06-20'
   s.summary      = 'Helpers to print unobtrusive jQuery-UI tags.'
   s.description  = <<-EOF

data/lib/jqr-helpers/version.rb

@@ -1,6 +1,6 @@
 module JqrHelpers
   # @private
   module Rails
-    VERSION = '1.0.45'
+    VERSION = '1.0.46'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jqr-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.45
+  version: 1.0.46
 platform: ruby
 authors:
 - Daniel Orner