Skip to content
This repository was archived by the owner on Nov 19, 2018. It is now read-only.

Commit 10e8aee

Browse files
committed
Simpler setup
- pull in fine-uploader from npm - auto bower update on npm install - npm start to run server
1 parent 98a28a8 commit 10e8aee

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

client.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181

8282
thumbnails: {
8383
placeholders: {
84-
notAvailablePath: "/fineuploader/not_available-generic.png",
85-
waitingPath: "/fineuploader/waiting-generic.png"
84+
notAvailablePath: "/fineuploader/placeholders/not_available-generic.png",
85+
waitingPath: "/fineuploader/placeholders/waiting-generic.png"
8686
}
8787
},
8888

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8" />
66

77
<link href="/bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
8-
<link href="/fineuploader/fineuploader.css" rel="stylesheet" type="text/css"/>
8+
<link href="/fineuploader/fine-uploader.css" rel="stylesheet" type="text/css"/>
99
<link href="custom.css" rel="stylesheet" type="text/css"/>
1010

1111
<script src="bower_components/jquery/dist/jquery.min.js"></script>
@@ -18,7 +18,7 @@
1818

1919
<script src="/bower_components/rsvp/rsvp.js"></script>
2020
<script src="/bower_components/frame-grab.js/client/frame-grab.js"></script>
21-
<script src="/fineuploader/all.fineuploader.js"></script>
21+
<script src="/fineuploader/jquery.fine-uploader.js"></script>
2222

2323
<script src="client.js"></script>
2424

package.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,19 @@
33
"description" : "Fine Uploader + frame-grab.js",
44
"dependencies" : {
55
"express": "3.x",
6+
"fine-uploader": "5.x",
67
"rimraf": "2.2.2",
78
"mkdirp": "0.3.5"
89
},
9-
"version" : "1.0.0"
10+
"devDependencies": {
11+
"bower": "1.x"
12+
},
13+
"scripts": {
14+
"postinstall": "bower update",
15+
"start": "node server"
16+
},
17+
"version" : "2.0.0",
18+
"engines" : {
19+
"node" : ">=5.0.0"
20+
}
1021
}

server.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ var PORT = 8000,
2727

2828
// paths/constants
2929
fileInputName = "qqfile",
30-
assetsPath = __dirname + "/assets/",
31-
placeholdersPath = assetsPath + "placeholders/",
32-
uploadedFilesPath = assetsPath + "uploadedFiles/",
30+
uploadedFilesPath = __dirname + "/assets/uploadedFiles/",
3331
chunkDirName = "chunks";
3432

3533

@@ -39,8 +37,7 @@ console.log("Express server started on port %s", PORT);
3937

4038
// routes
4139
app.use(express.static(__dirname));
42-
app.use("/fineuploader", express.static(assetsPath));
43-
app.use("/placeholders", express.static(placeholdersPath));
40+
app.use("/fineuploader", express.static(__dirname + "/node_modules/fine-uploader/jquery.fine-uploader/"));
4441
app.use("/uploads", express.static(uploadedFilesPath));
4542
app.post("/uploads", onUpload);
4643
app.delete("/uploads/:uuid", onDeleteFile);

0 commit comments

Comments
 (0)