jqr-helpers 1.0.43 → 1.0.44

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjIyZWM1MzQ1NDc3ZjVlNWYxNWYyMzZjODM3MDgzZGIyNDI0ZGMwNw==
+    NGYxZjI4YjA4YTA2NzQ1ODhkOTNlMTZmMTM5YmNlYTRiZWRiZjc5MQ==
   data.tar.gz: !binary |-
-    NTI5NGMxNzdkNjlmYjI2YTUzMGRjNWU0M2M3NzRiM2RhMzU3ZWNjZg==
+    ZmU3YTZmZjhiZTc2MTI0ZGFmOWQxYTM0ZDM5NWRkOTBmNDQ0NzlmNA==
 SHA512:
   metadata.gz: !binary |-
-    ZjlmYjQ1ZDA3NDcxNzQ4NDg4ZDA3YTljZGUxNDMzZjY2NWJlMzM4NjQ2NThk
-    MzU3ZGRhMmRiMjFlYTM1NjhlNjlkNDRmMDExMjM2Y2QzMGQ2YzNiZDQyMGMx
-    MTUxNjIwYThiZTY1M2QzOTA4NDlkNTFhZTBkZTI0M2QzYzJmNTI=
+    YTUyMGU5MWI2MTExYTU5MDRiOTQyODE3NDIwZjU0Y2NlODRhODYyYWI5NGY2
+    MGExYjBmNjE0ZTE0NjI5ZjM2YTcyM2ZiZjFmYmI0N2EwYjAwYTFjNjNlZGFl
+    YzdkNjI1NDVjMjUyNTUxOGEwOTJjN2UyZGE3ZTZkN2E0ZTZiNjQ=
   data.tar.gz: !binary |-
-    ODUzNDhiNDkzNWIwMDcyYjA4YWQ0OTEwZGRkNDAyYzg1YTIyNmRkOTE0YWYw
-    NTA5MGNlYzFkYjg0NmQxMjA0YzM3YzdmYmQ0ZDIzODY4YWZjMjM2MzU1MTg3
-    M2M3MzNmY2ZmMDljMTliNTRhMDRkYWU3ZTkwM2UzYjg3NDY4YzI=
+    ZGQ3YTc2OTAwODg2NDI2MzNmM2FmZWI2NWU5ODU0NDlhOTdmNjlmMjZiMmIw
+    OTdmYTExODA0MGU5NzViZWI4MTU0MWEzMTM3NDM4NzZkMTUxMmQ4YTdmZWJj
+    MGYzMjJiMmVhNjUyMzIwZTdjMjZmMjRmYjQ0YzY4NWZkMTkxNjk=

data/Readme.md

@@ -164,10 +164,11 @@ other elements.
 * `:scroll_to` (Boolean) - if given, the element that was updated or inserted
 will be scrolled into view (i.e. its top will be aligned with the top of the
 page).
-*`:throbber` (String) - This can be `:small`, `:large`, or
-`:none`. By default it is `:small`, indicating a throbber that goes in front
-of the screen. `:small` would be a small inline throbber next to the button or
-link that called the dialog, and `:none` shows no throbber at all.
+* `:throbber` (String) - This can be `:small`, `:large`, or
+`:none`. By default for most Ajax requests it is `:small`, indicating 
+a small inline throbber next to the button or link. For ``link_to_dialog`` and
+``button_to_dialog``, the default is ``:large``, meaning a throbber that goes in 
+front of the screen.`:none` shows no throbber at all.
 
 ## Monitoring Fields ##
 

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

@@ -23,7 +23,6 @@
   }
 
   var ujsDialogElement = null; // the element that opened the dialog
-  var ujsLastDialog = null; // last opened dialog
   var ujsSubmitElement = null; // the element that submitted a form
 
   // called from dialog button value
@@ -32,18 +31,19 @@
   }
 
   // called from dialog button value
+  // uses $.proxy to set the "this" context
   function ujsDialogClose() {
-    if (!ujsLastDialog) return;
-    if (ujsLastDialog.data('remote-dialog')) {
-      ujsLastDialog.dialog('destroy').remove();
+    var dialog = $(this).closest('.ui-dialog-content');
+    if (dialog.length == 0) dialog = $(this).find('.ui-dialog-content');
+    if (dialog.data('remote-dialog')) {
+      dialog.dialog('destroy').remove();
     }
     else {
-      ujsLastDialog.dialog('destroy').addClass('ujs-dialog-hidden');
+      dialog.dialog('destroy').addClass('ujs-dialog-hidden');
     }
   }
 
   function ujsDialogOpen() {
-    ujsLastDialog = $(this);
     $(this).css('maxHeight', ($(window).height() * 0.8) + 'px');
     if ($(this).parent().height() > $(window).height()) {
       $(this).height($(window).height() * 0.8);
@@ -102,10 +102,11 @@
           dialogOptions.buttons[index].click = ujsSubmitDialogForm;
         }
         else if (element == 'close') {
-          dialogOptions.buttons[index] = ujsDialogClose;
+          dialogOptions.buttons[index] = $.proxy(ujsDialogClose, dialogElement);
         }
         else if (element.click == 'close') {
-          dialogOptions.buttons[index].click = ujsDialogClose;
+          dialogOptions.buttons[index].click =
+              $.proxy(ujsDialogClose, dialogElement);
         }
         else {
           dialogOptions.buttons[index] = eval(element);
@@ -146,7 +147,7 @@
   }
 
   function ujsDialogCloseClick() {
-    ujsDialogClose();
+    ujsDialogClose.call(this);
     return false;
   }
 
@@ -231,7 +232,7 @@
       if (element.data('use-dialog-opener'))
         targetElement = ujsDialogElement;
       if (element.data('close-dialog'))
-        ujsDialogClose();
+        ujsDialogClose.call(element);
     }
     if (element.data('refresh')) {
       window.location.reload();
@@ -256,7 +257,10 @@
 
       switch (element.data('result-method')) {
         case 'update':
-          target = $(data).replaceAll(target);
+          // sometimes this adds text nodes
+          target = $(data).replaceAll(target).filter(function() {
+            return this.nodeType == 1;
+          });
           target.trigger('jqr.load');
           break;
         case 'append':

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.43'
-  s.date         = '2014-05-29'
+  s.version      = '1.0.44'
+  s.date         = '2014-06-13'
   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,6 +1,6 @@
 module JqrHelpers
   # @private
   module Rails
-    VERSION = '1.0.43'
+    VERSION = '1.0.44'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jqr-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.44
 platform: ruby
 authors:
 - Daniel Orner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement