Skip to content

Commit 862de2a

Browse files
greatghoulgreatghoul
committed
Merge branch 'feature/upload_file'
2 parents fd41240 + ec55bea commit 862de2a

19 files changed

+720
-277
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
/node_modules
2-
/demo

‎Gruntfile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = function(grunt) {
1717
transform: [["babelify", { stage: 0 }]]
1818
},
1919
files: {
20-
"dist/qiniu-uploader.js": "src/qiniu-uploader.js"
20+
"dist/deep_uploader.js": "src/deep_uploader.js"
2121
}
2222
}
2323
},
@@ -28,8 +28,8 @@ module.exports = function(grunt) {
2828
banner: '/*! <%= pkg.name %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
2929
},
3030
build: {
31-
src: 'dist/qiniu-uploader.js',
32-
dest: 'dist/qiniu-uploader.min.js'
31+
src: 'dist/deep_uploader.js',
32+
dest: 'dist/deep_uploader.min.js'
3333
}
3434
},
3535

‎demo/application.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
$(function() {
2+
DeepUploader.register({
3+
name: 'image',
4+
uploader: 'qiniu',
5+
uptokenUrl: 'http://jssdk.demo.qiniu.io/uptoken',
6+
bucket: 'qiniu-plupload',
7+
domain: 'http://qiniu-plupload.qiniudn.com/',
8+
accept: 'image/*'
9+
});
10+
11+
$(document).on('click', '.test', DeepUploader.browseHandler);
12+
13+
$(document).on('FileAdded', '.test1', function(event) {
14+
console.log('test1', event.originalEvent.detail);
15+
});
16+
17+
$(document).on('FileAdded', '.test', function(event) {
18+
console.log('.test', event.originalEvent.detail);
19+
});
20+
21+
$(document).on('FileUploaded', '.test', function(event) {
22+
console.log('.test', event.originalEvent.detail);
23+
24+
var $image = $('<img />');
25+
$image.attr('src', event.originalEvent.detail.response.url);
26+
$image.appendTo('body');
27+
});
28+
29+
$(document).on('FileAdded', function(event) {
30+
console.log('document', event.originalEvent.detail);
31+
});
32+
});

‎demo/index.html

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>Document</title>
6+
</head>
7+
<body>
8+
<button class="test" data-uploader-profile="image">触发上传</button>
9+
<button class="test1">触发上传</button>
10+
<script src="jquery.min.js"></script>
11+
<script src="../dist/deep_uploader.js"></script>
12+
<script src="application.js"></script>
13+
</body>
14+
</html>

‎demo/jquery.min.js

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)