Fixes branching of loading form parsing modules

cloudwork · Jul 29, 2010 · 4d700f5 · 4d700f5
1 parent 63f35a4
commit 4d700f5
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/lib/media/multipart-form-data.js b/lib/media/multipart-form-data.js
@@ -1,35 +1,36 @@
 /**
  * Registers multi-part media type handling
  */
-var parseMultipart = require("jsgi/multipart").parseMultipart,
-	stringToValue = require("./auto-type").stringToValue,
+var stringToValue = require("./auto-type").stringToValue,
 	mediaModule = require("../media"),
 	Media = require("../media").Media,
 	fs = require("promised-io/fs"),
-	defer = require("promised-io/promise").defer,
-	IncomingForm = require("node-formidable/formidable/incoming_form").IncomingForm,
-	Node = require("jsgi-node/jsgi/node").Node;
+	defer = require("promised-io/promise").defer;
 var parseMultipart = typeof process == "undefined" ?
 	// jack form parser
 	require("jack/utils").parseMultipart :
 	// node form parser
-	function(request){ 
-		var form = new IncomingForm();
-		var deferred = defer();
-		Node(function(request){
-	    	form.parse(request, function(err, fields, files) {
-	    		var incomingObject = {};
-	    		if(err){
-	    			return deferred.reject(err);
-	    		}
-	    		for(var i in files){
-	    			fields[i] = files[i];
-	    		}
-	    		deferred.resolve(fields);
-	    	});
-		})(request);
-		return deferred.promise;
-	};
+	(function(IncomingForm, Node){
+		return function(request){ 
+			var form = new IncomingForm();
+			var deferred = defer();
+			Node(function(request){
+		    	form.parse(request, function(err, fields, files) {
+		    		var incomingObject = {};
+		    		if(err){
+		    			return deferred.reject(err);
+		    		}
+		    		for(var i in files){
+		    			fields[i] = files[i];
+		    		}
+		    		deferred.resolve(fields);
+		    	});
+			})(request);
+			return deferred.promise;
+		};
+	})(
+	require("node-formidable/formidable/incoming_form").IncomingForm, 
+	require("jsgi-node/jsgi/node").Node);
 
 
 Media({