Skip to content

Commit 8235152

Browse files
committed
aguidrevitch#31 request and response objects passed to event handlers
1 parent b1ac0a8 commit 8235152

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

History.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.1.5 / 2014-08-02
2+
==================
3+
4+
* #31 request and response objects passed to event handlers
5+
16
0.1.4 / 2014-07-06
27
==================
38

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ More sophisticated example - Events
100100
app.use('/upload', upload.fileHandler());
101101

102102
// events
103-
upload.on('begin', function (fileInfo) {
103+
upload.on('begin', function (fileInfo, req, res) {
104104
// fileInfo structure is the same as returned to browser
105105
// {
106106
// name: '3 (3).jpg',
@@ -113,10 +113,10 @@ More sophisticated example - Events
113113
// thumbnail_url: 'http://youhost/uploads/thumbnail/3%20(3).jpg'
114114
// }
115115
});
116-
upload.on('abort', function (fileInfo) { ... });
117-
upload.on('end', function (fileInfo) { ... });
118-
upload.on('delete', function (fileInfo) { ... });
119-
upload.on('error', function (e) {
116+
upload.on('abort', function (fileInfo, req, res) { ... });
117+
upload.on('end', function (fileInfo, req, res) { ... });
118+
upload.on('delete', function (fileInfo, req, res) { ... });
119+
upload.on('error', function (e, req, res) {
120120
console.log(e.message);
121121
});
122122
```

lib/filehandler.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module.exports = function (middleware, options) {
22

33
return function (req, res, next) {
4+
this.req = req;
45
res.set({
56
'Access-Control-Allow-Origin': options.accessControl.allowOrigin,
67
'Access-Control-Allow-Methods': options.accessControl.allowMethods
@@ -21,19 +22,19 @@ module.exports = function (middleware, options) {
2122
});
2223

2324
handler.on('begin', function (fileInfo) {
24-
middleware.emit('begin', fileInfo);
25+
middleware.emit('begin', fileInfo, req, res);
2526
});
2627
handler.on('end', function (fileInfo) {
27-
middleware.emit('end', fileInfo);
28+
middleware.emit('end', fileInfo, req, res);
2829
});
2930
handler.on('abort', function (fileInfo) {
30-
middleware.emit('abort', fileInfo);
31+
middleware.emit('abort', fileInfo, req, res);
3132
});
3233
handler.on('error', function (e) {
33-
middleware.emit('abort', e);
34+
middleware.emit('abort', e, req, res);
3435
});
3536
handler.on('delete', function (fileName) {
36-
middleware.emit('delete', fileName);
37+
middleware.emit('delete', fileName, req, res);
3738
});
3839

3940
switch (req.method) {

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"express",
99
"middleware"
1010
],
11-
"version": "0.1.4",
11+
"version": "0.1.5",
1212
"dependencies": {
1313
"formidable": ">=1.0.11",
1414
"imagemagick": ">=0.1.2",
@@ -29,6 +29,6 @@
2929
"scripts": {
3030
"test": "echo \"Error: no test specified\" && exit 1"
3131
},
32-
"_id": "jquery-file-upload-middleware@0.1.4",
32+
"_id": "jquery-file-upload-middleware@0.1.5",
3333
"license": "MIT"
3434
}

0 commit comments

Comments
 (0)