jqr-helpers 1.0.21 → 1.0.22

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

@@ -28,8 +28,14 @@
 
   // called from dialog button value
   function ujsDialogClose() {
-    $('.ui-dialog-content:visible').dialog('destroy')
-        .addClass('ujs-dialog-hidden');
+    $('.ui-dialog-content:visible').each(function() {
+      if ($(this).data('remote-dialog')) {
+        $(this).dialog('destroy').remove();
+      }
+      else {
+        $(this).dialog('destroy').addClass('ujs-dialog-hidden');
+      }
+    });
   }
 
   function ujsDialogOpen() {
@@ -110,6 +116,7 @@
         $('body').append("<div id='" + dialogID + "'>");
         dialogElement = $('#' + dialogID);
       }
+      dialogElement.data('remote-dialog', true);
       dialogElement.load(url, function() {
         if (closeX) {
           dialogElement.prepend('<span class="ujs-dialog-x"></span>');
@@ -145,7 +152,8 @@
   function ujsButtonClick(event) {
     var element = $(this);
     element.uniqueId(); // to store for later
-    if ($.rails.allowAction(element)) {
+    // if the button is inside a form, allowAction is already called.
+    if ($(this).closest('form').length || $.rails.allowAction(element)) {
       element.data('confirm', null); // we've already fired it
       // largely copied from rails_jquery.js
       var href = element.data('url');

data/jqr-helpers.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name         = 'jqr-helpers'
   s.require_paths = %w(. lib lib/jqr-helpers)
-  s.version      = '1.0.21'
-  s.date         = '2014-01-04'
+  s.version      = '1.0.22'
+  s.date         = '2014-01-09'
   s.summary      = 'Helpers to print unobtrusive jQuery-UI tags.'
   s.description  = <<-EOF
     This gem adds helper methods to create unobtrusive jQuery code. It outputs

data/lib/jqr-helpers/version.rb

@@ -1,5 +1,5 @@
 module JqrHelpers
   module Rails
-    VERSION = '1.0.21'
+    VERSION = '1.0.22'
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: jqr-helpers
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Daniel Orner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails