jqr-helpers 1.0.10 → 1.0.11

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

@@ -5,11 +5,12 @@
   }
 
   function hideThrobber(element) {
-    $(element).next().remove();
+    $(element).nextAll('.throbber').remove();
     $(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
   function ujsSubmitDialogForm() {
@@ -47,11 +48,13 @@
     if ($(this).data('close-x')) {
       dialogElement.prepend('<span class="ujs-dialog-x"></span>');
     }
+    var url = $(this).data('dialog-url');
     var dialogOptions = $(this).data('dialog-options');
     var open = dialogOptions['open'];
     dialogOptions = $.extend(dialogOptions, {
       'close': function() {
         $(this).dialog('destroy').addClass('ujs-dialog-hidden');
+        if (url) $(this).remove();
       },
       'open': function() {
         ujsDialogOpen.call(this);
@@ -77,7 +80,6 @@
         }
       });
     }
-    var url = $(this).data('dialog-url');
     if (url) {
       $(this).trigger('jqr.beforedialogopen');
       $(document.body).append('<div class="ui-widget-overlay ui-front">');
@@ -108,6 +110,10 @@
     return false;
   }
 
+  function ujsSubmitClick(event) {
+    ujsSubmitElement = event.target;
+  }
+
   function ujsButtonClick(event) {
     var element = $(this);
     element.uniqueId(); // to store for later
@@ -142,19 +148,10 @@
     if (element.data('real-element')) {
       element = $('#' + element.data('real-element'));
     }
-    if (element.is('form')) {
-      var submit = $('input[type=submit]', element);
-      if (submit.length)
-        showThrobber(submit);
-      else
-        showThrobber(element);
-    }
-    else {
-      showThrobber(element);
-    }
-    if (element.is('form'))
-      element = $('button, input[type=submit]', element).first();
-    element.attr('disabled', 'disabled');
+    if (element.is('form') &&
+        $(ujsSubmitElement).parents('form').index(element) >= 0)
+      element = ujsSubmitElement;
+    showThrobber(element);
   }
 
   function ujsAjaxSuccess(evt, data, status, xhr) {
@@ -162,11 +159,11 @@
     if (element.data('real-element')) {
       element = $('#' + element.data('real-element'));
     }
-    hideThrobber(element);
     var disableElement = element;
-    if (element.is('form'))
-      disableElement = $('button, input[type=submit]', element).first();
-    disableElement.attr('disabled', false);
+    if (element.is('form') &&
+        $(ujsSubmitElement).parents('form').index(element) >= 0)
+      disableElement = ujsSubmitElement;
+    hideThrobber(disableElement);
     var targetElement = element;
     // if this was sent from a dialog, close the dialog and look at the
     // element that opened it for update/append/delete callbacks.
@@ -180,7 +177,7 @@
       var callback = eval(element.data('callback'));
       callback.call(targetElement, data);
     }
-    if (data && data.trim().charAt(0) != '<' && data != 'success') {
+    else if (data && data.trim().charAt(0) != '<' && data != 'success') {
       alert(data);
       return;
     }
@@ -270,6 +267,7 @@
   $(function() {
     if ($().on) { // newer jQueries
       $(document).on('jqr.load', ujsLoadPlugins);
+      $(document).on('click', 'input[type=submit]', ujsSubmitClick);
       $(document).on('click', '.ujs-dialog', ujsDialogClick);
       $(document).on('click', '.ujs-dialog-close, .ujs-dialog-x',
           ujsDialogCloseClick);
@@ -281,6 +279,7 @@
     }
     else {
       $('body').live('jqr.load', ujsLoadPlugins);
+      $('input[type=submit]').live('click', ujsSubmitClick);
       $('.ujs-dialog').live('click', ujsDialogClick);
       $('.ujs-dialog-close, .ujs-dialog-x').live('click', ujsDialogCloseClick);
       $('.ujs-ajax-button').live('click', ujsButtonClick);
@@ -291,6 +290,13 @@
     }
     $('body').trigger('jqr.load');
 
+    // Derived from
+    // https://makandracards.com/makandra/3877-re-enable-submit-buttons-disabled-by-the-disabled_with-option
+    $(window).unload(function() {
+      $.rails.enableFormElements($($.rails.formSubmitSelector));
+      $('input[disabled],button[disabled],select[disabled]').prop('disabled', false);
+    });
+
   });
 
 }(jQuery));

data/app/assets/stylesheets/jqr-helpers.css

@@ -1,7 +1,3 @@
-form.ujs-ajax, form.ujs-ajax div {
-    display: inline;
-}
-
 .ujs-dialog-modal {
     position: fixed !important;
 }

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.10'
+  s.version      = '1.0.11'
   s.date         = '2013-11-19'
   s.summary      = 'Helpers to print unobtrusive jQuery-UI tags.'
   s.description  = <<-EOF

data/lib/jqr-helpers/version.rb

@@ -1,5 +1,5 @@
 module JqrHelpers
   module Rails
-    VERSION = '1.0.10'
+    VERSION = '1.0.11'
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jqr-helpers
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Daniel Orner