remotipart 0.3.2 → 0.3.3

data/README.rdoc

@@ -14,21 +14,26 @@ This gem augments the native Rails jQuery remote form function enabling asynchro
 
 == Version Compatibility
 
-<table><tr><th>Remotipart version</th><th>Compatible with rails.js version</th></tr>
-<tr><td></td><td></td></tr>
-<tr><td></td><td></td></tr>
-<tr><td></td><td></td></tr>
-<tr><td></td><td></td></tr>
-</table>
+  +---------------------------------------------------------------------+
+  | Version of remotipart.js | is compatible with versions of rails.js* |
+  +---------------------------------------------------------------------+
+  |        <= 0.3.1          | <= 498b35e24cdb14f2                      |
+  |           0.3.2          |  > 498b35e24cdb14f2, <= 7f2acc1811f62877 |
+  |           0.3.3          |  > 7f2acc1811f62877, <= d2abd6f9df4e4a42 |
+  +---------------------------------------------------------------------+
+
+*rails.js versions <em>(For a full list of Rails.js]versions and diffs, see {Rails jQuery UJS Changelog}[https://github.com/rails/jquery-ujs/blob/master/CHANGELOG.md])</em>:
+* {498b35e24cdb14f2}[https://github.com/rails/jquery-ujs/raw/498b35e24cdb14f2d94486e8a1f4a1f661091426/src/rails.js]
+* {7f2acc1811f62877}[https://github.com/rails/jquery-ujs/raw/7f2acc1811f62877611e16451530728b5e13dbe7/src/rails.js]
+* {d2abd6f9df4e4a42}[https://github.com/rails/jquery-ujs/raw/d2abd6f9df4e4a426c17c218b7d5e05004c768d0/src/rails.js]
 
 == Installation
 
-<b>Prerequisite: Make sure you have a supported jquery-ujs (rails.js) version.</b>
-
-<b>To be certain, replace public/javascripts/rails.js with {this version}[https://github.com/rails/jquery-ujs/raw/51272c68714748420d8c35984b3e2532ab14f748/src/rails.js] of rails.js. Alternatively, follow {these instructions}[https://github.com/formasfunction/remotipart/wiki/Getting-Remotipart-to-work-with-latest-jquery-ujs] to get Remotipart working with the latest jquery-ujs.</b>
+<b>Prerequisite: Make sure you have a supported jquery-ujs (rails.js) version from the previous section.</b>
 
 1. Install the Remotipart gem
-   * Add this line to your GEMFILE
+
+   * Add this line to your GEMFILE (add the correct version from previous section if needed)
 
     gem 'remotipart'
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/lib/generators/templates/jquery.remotipart.js

@@ -1,72 +1,80 @@
 (function ($) {
-    function fire(obj, name, data) {
-	  	var event = new $.Event(name);
-	  	obj.trigger(event, data);
-	  	return event.result !== false;
-	  }
-    $.fn.extend({
-		/**
-	     * Handles execution of remote calls involving file uploads, firing overridable events along the way
-	     */
-	    callRemotipart: function () {
-	        var el      = this,
-	            url     = el.attr('action'),
-              dataType = el.attr('data-type') || 'script';
+  // Triggers an event on an element and returns the event result
+  function fire(obj, name, data) {
+    var event = new $.Event(name);
+    obj.trigger(event, data);
+    return event.result !== false;
+  }
 
-	        if (url === undefined) {
-	          throw "No URL specified for remote call (action must be present).";
-	        } else {
-              // Since iframe-submitted form is submitted normal-style and cannot set custom headers,
-              // we'll add a custom hidden input to keep track and let the server know this was still
-              // an AJAX form, we'll also make it easy to tell from our jQuery element object.
-              el
-                .append($('<input />', {
-                  type: "hidden",
-                  name: "remotipart_submitted",
-                  value: true
-                }))
-                .data('remotipartSubmitted', dataType);
+  // Submits "remote" forms and links with ajax
+  function handleRemote(element) {
+    var method, url, data,
+    dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType) || 'script';
 
-              if (dataType == 'script') {
-		          	url = url.split('?'); // split on GET params
-					      if(url[0].substr(-3) != '.js') url[0] += '.js'; // force rails to respond to respond to the request with :format = js
-					      url = url.join('?'); // join on GET params
-              }
-					
-	                el.ajaxSubmit({
-	                    url: url,
-	                    dataType: dataType,
-	                    beforeSend: function (xhr, settings) {
-                        if (settings.dataType === undefined) {
-                          xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
-                        }
-                        var proceed = fire(el, 'ajax:beforeSend', [xhr, settings, true]);
-                        if (proceed) { el.trigger('ajax:loading', [xhr]); }
-                        return proceed;
-                      },
-	                    success: function (data, status, xhr) {
-	                        el.trigger('ajax:success', [data, status, xhr]);
-	                    },
-	                    complete: function (xhr) {
-	                        el.trigger('ajax:complete', xhr);
-	                    },
-	                    error: function (xhr, status, error) {
-	                        el.trigger('ajax:failure ajax:error', [xhr, status, error]);
-	                    }
-	                });
-	            }
+    // Since iframe-submitted form is submitted normal-style and cannot set custom headers,
+    // we'll add a custom hidden input to keep track and let the server know this was still
+    // an AJAX form.
+    element.append($('<input />', {
+      type: "hidden",
+      name: "remotipart_submitted",
+      value: true
+      }))
+      .data('remotipartSubmitted', dataType);
 
-	            el.trigger('ajax:after');
-		}
-	});
+    if (fire(element, 'ajax:before')) {
+      method = element.attr('method');
+      url = element.attr('action');
+      data = element.serializeArray();
+      // memoized value from clicked submit button
+      var button = element.data('ujs:submit-button');
+      if (button) {
+        data.push(button);
+        element.data('ujs:submit-button', null);
+      }
 
-  $('form[data-remote]').live('ajax:beforeSend', function (evt, xhr, settings, remotipart) {
 
-    if (!remotipart && $(this).find('input:file').length) {
-      $(this).callRemotipart();
+      if (dataType == 'script') {
+        url = url.split('?'); // split on GET params
+        if(url[0].substr(-3) != '.js') url[0] += '.js'; // force rails to respond to respond to the request with :format = js
+        url = url.join('?'); // join on GET params
+      }
+      element.ajaxSubmit({
+        url: url, type: method || 'GET', data: data, dataType: dataType,
+        // stopping the "ajax:beforeSend" event will cancel the ajax request
+        beforeSend: function(xhr, settings) {
+          return fire(element, 'ajax:beforeSend', [xhr, settings]);
+        },
+        success: function(data, status, xhr) {
+          element.trigger('ajax:success', [data, status, xhr]);
+        },
+        complete: function(xhr, status) {
+          element.trigger('ajax:complete', [xhr, status]);
+        },
+        error: function(xhr, status, error) {
+          element.trigger('ajax:error', [xhr, status, error]);
+        }
+      });
+    }
+  }
+
+  function disableFormElements(form) {
+    form.find('input[data-disable-with]').each(function() {
+      var input = $(this);
+      input.data('ujs:enable-with', input.val())
+      .val(input.attr('data-disable-with'))
+      .attr('disabled', 'disabled');
+    });
+  }
+
+  $('form').live('ajax:aborted:file.remotipart', function(){
+    var form = $(this), remote = form.attr('data-remote') != undefined;
+
+    if (remote) {
+      handleRemote(form);
       return false;
+    } else {
+      disableFormElements(form);
     }
-    
-    return true;
   });
+
 })(jQuery);

data/remotipart.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remotipart}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Leppert", "Steve Schwartz"]
-  s.date = %q{2011-05-01}
+  s.date = %q{2011-05-02}
   s.description = %q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.
     This gem augments the native Rails jQuery remote form function enabling asynchronous file uploads with little to no modification to your application.
     It requires jQuery (http://jquery.com), the Rails jQuery driver (http://github.com/rails/jquery-ujs), and the jQuery Form plugin (http://jquery.malsup.com/form/).

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remotipart
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Greg Leppert
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency