jquery-rails-multipart-xhr 0.0.2 → 0.0.3

data/.rbenv-gemsets

@@ -0,0 +1 @@
+global

data/lib/jquery/rails/multipart_xhr/version.rb

@@ -1,8 +1,8 @@
 module Jquery
   module Rails
-    JQUERY_MULTIPART_XHR_VERSION = "0.0.2"    
+    JQUERY_MULTIPART_XHR_VERSION = "0.0.3"
     module MultipartXHR
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/vendor/assets/javascripts/jquery_ujs_multipart_xhr.js

@@ -32,11 +32,10 @@
 **/
 (function( $, undefined ){
 	
-	var jxhr  = $.ajaxSettings.xhr,
-			rails = $.rails;
+	var jxhr  = $.ajaxSettings.xhr;
 	
 	
-	$.extend(rails, {
+	$.extend($.rails, {
 		
 		// Enable / disable ajax file uploading.
 		enableXHRUpload: true,
@@ -89,20 +88,20 @@
 		// Actual upload handler
 		//
 		handleRemoteUpload: function( form, options ){
-			var data = rails.buildMultipartPost( form );
+			var data = $.rails.buildMultipartPost( form );
 			options.contentType = false;
 			options.processData = false;
 			options.data        = data[0];
 			options.context     = form;
-			rails.fire( form, 'ajax:upload:start', [ data[1] ] );
+			$.rails.fire( form, 'ajax:upload:start', [ data[1] ] );
 			return $.ajax( options );
 		}
 		
 	});
 	
 	// Explicitly disable XHR uploading if the browser doesn't support it.
-	if( !rails.XHRUploadSupport() && !rails.fileApiSupport() ){
-		rails.enableXHRUpload = false;
+	if( !$.rails.XHRUploadSupport() && !$.rails.fileApiSupport() ){
+		$.rails.enableXHRUpload = false;
 	}
 	
 	// Recieves a progress event and returns an object representing the progress of the upload.
@@ -125,14 +124,18 @@
 		
 	
 	function handle_files( form ){
-		var oajax = rails.ajax;
+		var oajax = $.rails.ajax;
 		
-		if( rails.enableXHRUpload ){
-			rails.ajax = function( options ){ 
-				rails.handleRemoteUpload( $(form), options ); 
+		if( $.rails.enableXHRUpload === true ){
+			$.rails.ajax = function( options ){ 
+				$.rails.handleRemoteUpload( $(form), options ); 
 			};
-			rails.handleRemote( form );
-			rails.ajax = oajax;
+			
+			form.one('ajax:complete', 
+				function(xhr, status){
+					$.rails.ajax = oajax;
+				});
+				
 			return false;
 		}		
 		return true;
@@ -163,7 +166,7 @@
 	});
 	
 	
-	$(document).delegate(rails.formSubmitSelector, 'ajax:aborted:file', function(event) {
+	$(document).delegate($.rails.formSubmitSelector, 'ajax:aborted:file', function(event) {
 		if (this == event.target) 
 		return handle_files($(this));
 	});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails-multipart-xhr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -86,6 +86,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-gemsets
 - Gemfile
 - README.md
 - Rakefile