9
9
* Module dependencies.
10
10
*/
11
11
12
- var utils = require ( 'connect/utils' ) ,
13
- formidable = require ( 'formidable' ) ;
12
+ var formidable = require ( 'formidable' ) ;
14
13
15
14
/**
16
15
* Setup form with the given `options`.
@@ -57,7 +56,7 @@ module.exports = function(options){
57
56
if ( formRequest ( req ) ) {
58
57
var callback = function ( ) { } ,
59
58
form = req . form = new formidable . IncomingForm ;
60
- utils . merge ( form , options ) ;
59
+ merge ( form , options ) ;
61
60
form . complete = function ( fn ) { callback = fn ; } ;
62
61
form . parse ( req , function ( ) {
63
62
callback . apply ( this , arguments ) ;
@@ -75,10 +74,27 @@ module.exports = function(options){
75
74
* @api private
76
75
*/
77
76
78
- function formRequest ( req ) {
77
+ function formRequest ( req ) {
79
78
return req . body === undefined
80
79
&& ( req . method === 'POST'
81
80
|| req . method === 'PUT' )
82
81
&& ( req . headers [ 'content-type' ] . indexOf ( 'multipart/form-data' ) >= 0
83
82
|| req . headers [ 'content-type' ] . indexOf ( 'urlencoded' ) >= 0 ) ;
83
+ }
84
+
85
+ /**
86
+ * Merge object `b` with object `a`.
87
+ *
88
+ * @param {Object } a
89
+ * @param {Object } b
90
+ * @return {Object } a
91
+ * @api private
92
+ */
93
+
94
+ function merge ( a , b ) {
95
+ var keys = Object . keys ( b ) ;
96
+ for ( var i = 0 , len = keys . length ; i < len ; ++ i ) {
97
+ a [ keys [ i ] ] = b [ keys [ i ] ] ;
98
+ }
99
+ return a ;
84
100
}
0 commit comments