Merge branch 'master' into jquery-ui

blueimp · blueimp · commit 2382b1fc1370 · 2012-07-09T11:38:49.000+02:00
diff --git a/server/node/package.json b/server/node/package.json
@@ -1,6 +1,6 @@
 {
     "name": "blueimp-file-upload-node",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "title": "jQuery File Upload Node.js example",
     "description": "Node.js implementation example of a file upload handler for jQuery File Upload.",
     "keywords": [
diff --git a/server/node/server.js b/server/node/server.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * jQuery File Upload Plugin Node.js Example 1.0.1
+ * jQuery File Upload Plugin Node.js Example 1.0.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2012, Sebastian Tschan
@@ -10,14 +10,15 @@
  * http://www.opensource.org/licenses/MIT
  */
 
-/*jslint nomen: true, regexp: true */
+/*jslint nomen: true, regexp: true, unparam: true */
 /*global require, __dirname, unescape */
 
 (function (port) {
     'use strict';
-    var util = require('util'),
-        path = require('path'),
+    var path = require('path'),
         fs = require('fs'),
+        // Since Node 0.8, .existsSync() moved from path to fs:
+        _existsSync = fs.existsSync || path.existsSync,
         formidable = require('formidable'),
         nodeStatic = require('node-static'),
         imageMagick = require('imagemagick'),
@@ -163,7 +164,7 @@
         // Prevent directory traversal and creating hidden system files:
         this.name = path.basename(this.name).replace(/^\.+/, '');
         // Prevent overwriting existing files:
-        while (path.existsSync(options.uploadDir + '/' + this.name)) {
+        while (_existsSync(options.uploadDir + '/' + this.name)) {
             this.name = this.name.replace(nameCountRegexp, nameCountFunc);
         }
     };
@@ -174,7 +175,7 @@
                     '//' + req.headers.host + options.uploadUrl;
             this.url = this.delete_url = baseUrl + encodeURIComponent(this.name);
             Object.keys(options.imageVersions).forEach(function (version) {
-                if (path.existsSync(
+                if (_existsSync(
                         options.uploadDir + '/' + version + '/' + that.name
                     )) {
                     that[version + '_url'] = baseUrl + version + '/' +
@@ -281,4 +282,4 @@
     } else {
         require('http').createServer(serve).listen(port);
     }
-}(8080));
+}(8888));

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "blueimp-file-upload-node",`
`3`		`- "version": "1.0.1",`
	`3`	`+ "version": "1.0.2",`
`4`	`4`	`"title": "jQuery File Upload Node.js example",`
`5`	`5`	`"description": "Node.js implementation example of a file upload handler for jQuery File Upload.",`
`6`	`6`	`"keywords": [`