Skip to content

Commit 042229f

Browse files
committed
Removed require("connect/utils")
1 parent c81b65a commit 042229f

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

lib/connect-form.js

+20-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
* Module dependencies.
1010
*/
1111

12-
var utils = require('connect/utils'),
13-
formidable = require('formidable');
12+
var formidable = require('formidable');
1413

1514
/**
1615
* Setup form with the given `options`.
@@ -57,7 +56,7 @@ module.exports = function(options){
5756
if (formRequest(req)) {
5857
var callback = function(){},
5958
form = req.form = new formidable.IncomingForm;
60-
utils.merge(form, options);
59+
merge(form, options);
6160
form.complete = function(fn){ callback = fn; };
6261
form.parse(req, function(){
6362
callback.apply(this, arguments);
@@ -75,10 +74,27 @@ module.exports = function(options){
7574
* @api private
7675
*/
7776

78-
function formRequest(req){
77+
function formRequest(req) {
7978
return req.body === undefined
8079
&& (req.method === 'POST'
8180
|| req.method === 'PUT')
8281
&& (req.headers['content-type'].indexOf('multipart/form-data') >= 0
8382
|| 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;
84100
}

0 commit comments

Comments
 (0)