remotipart 0.3.3 → 0.3.4

data/README.rdoc

@@ -17,15 +17,17 @@ This gem augments the native Rails jQuery remote form function enabling asynchro
   +---------------------------------------------------------------------+
   | Version of remotipart.js | is compatible with versions of rails.js* |
   +---------------------------------------------------------------------+
-  |        <= 0.3.1          | <= 498b35e24cdb14f2                      |
+  |        <= 0.3.1          |                      <= 498b35e24cdb14f2 |
   |           0.3.2          |  > 498b35e24cdb14f2, <= 7f2acc1811f62877 |
   |           0.3.3          |  > 7f2acc1811f62877, <= d2abd6f9df4e4a42 |
+  |           0.3.4          |  > d2abd6f9df4e4a42 (i.e. latest)        |
   +---------------------------------------------------------------------+
 
 *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]
+* {latest}[https://github.com/rails/jquery-ujs/raw/master/src/rails.js]
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

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

@@ -1,80 +1,84 @@
-(function ($) {
-  // 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;
-  }
-
-  // Submits "remote" forms and links with ajax
-  function handleRemote(element) {
-    var method, url, data,
-    dataType = element.attr('data-type') || ($.ajaxSettings && $.ajaxSettings.dataType) || 'script';
-
-    // 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);
-
-    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);
-      }
-
-
-      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);
+(function($) {
+
+  var remotipart;
+
+  $.remotipart = remotipart = {
+
+    setup: function(form) {
+      form
+        // Append hidden input so we can tell from back-end when form has been submitted by remotipart
+        .append($('<input />', {
+          'id': "remotipart_submitted",
+          type: "hidden",
+          name: "remotipart_submitted",
+          value: true
+        }))
+
+        // Allow setup part of $.rails.handleRemot to setup remote settings before canceling default remote handler
+        .bind('ajax:beforeSend.remotipart', function(e, xhr, origSettings){
+          // Shallow copy
+          var settings = $.extend({}, origSettings);
+
+          // Delete the beforeSend bindings, since we're about to re-submit via ajaxSubmit with the beforeSubmit
+          // hook that was just setup and triggered via the default `$.rails.handleRemote`
+          delete settings.beforeSend;
+          // form.js's `ajaxSubmit` will re-create this for us
+          delete settings.data;
+
+          // Manually set the default dataType if not defined, since the form.js's `ajaxSubmit` function
+          // does not actually submit an xhr request (which has its default dataType set by rails.js)
+          if (settings.dataType === undefined) settings.dataType = 'script';
+
+          // Allow remotipartSubmit to be cancelled if needed
+          if ($.rails.fire(form, 'ajax:remotipartSubmit', [xhr, settings])) {
+
+            // Setup request URL for js dataType (needed for some versions of IE)
+            if (settings.dataType == 'script') {
+		          settings.url = settings.url.split('?'); // split on GET params
+		          if (settings.url[0].substr(-3) != '.js') settings.url[0] += '.js'; // force rails to respond to respond to the request with :format = js
+		          settings.url = settings.url.join('?'); // join on GET params
+            }
+
+            // Update remotipartSubmitted data with dataType, in case needed in other scripts
+            form.data('remotipartSubmitted', settings.dataType);
+            // And finally, Use form.js's `ajaxSubmit` to do remote file uploading via iframe method
+            form.ajaxSubmit(settings);
+
+            // Cancel the default jquery-ujs remote call by returning false for `ajax:beforeSend`
+            return false;
+          }
+        })
+
+        // Keep track that we just set this particular form with Remotipart bindings
+        // Note: The `true` value will get over-written with the `settings.dataType` from the `ajax:beforeSend` handler
+        .data('remotipartSubmitted', true);
+    },
+
+    teardown: function(form) {
+      form
+        .unbind('ajax:beforeSend.remotipart')
+        .children('#remotipart_submitted').remove();
+      delete form.data.remotipartSubmitted;
     }
+  };
+
+  $('form').live('ajax:aborted:file', function(){
+    var form = $(this);
+
+    // Only need to setup form and make form bindings once.
+    // If form has already been setup, just let bindings be executed.
+    if (form.data('remotipartSubmitted') === undefined) remotipart.setup(form);
+
+    // If browser does not support submit bubbling, then this live-binding will be called before direct
+    // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
+    if (!$.support.submitBubbles && 'callFormSubmitBindings' in $.rails && $.rails.callFormSubmitBindings(form) === false) return $.rails.stopEverything(e);
+
+    // Manually call jquery-ujs remote call so that it can setup form and settings as usual,
+    // and trigger the `ajax:beforeSend` callback to which remotipart binds functionality.
+    $.rails.handleRemote(form);
+
+    // Return false to prevent standard browser behavior (part of jquery-ujs api for `ajax:aborted:file`)
+    return false;
   });
 
 })(jQuery);

data/remotipart.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remotipart}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Leppert", "Steve Schwartz"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remotipart
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Greg Leppert