Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.12"
- '4'
cache:
directories:
- node_modules
Expand All @@ -9,4 +9,4 @@ install:
- npm install
- bower install
script:
- grunt
- grunt
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,15 @@ Qiniu-JavaScript-SDK 的示例 Demo 中的服务器端部分是基于[ Node.js
},
'FileUploaded': function(up, file, info) {
// 每个文件上传成功后,处理相关的事情
// 其中 info 是文件上传成功后,服务端返回的json,形式如
// 其中 info.response 是文件上传成功后,服务端返回的json,形式如
// {
// "hash": "Fh8xVqod2MQ1mocfI4S4KpRL6D98",
// "key": "gogopher.jpg"
// }
// 参考http://developer.qiniu.com/docs/v6/api/overview/up/response/simple-response.html

// var domain = up.getOption('domain');
// var res = parseJSON(info);
// var res = parseJSON(info.response);
// var sourceLink = domain + res.key; 获取上传成功后的文件的Url
},
'Error': function(up, err, errTip) {
Expand Down Expand Up @@ -467,11 +467,11 @@ Qiniu-JavaScript-SDK 的示例 Demo 中的服务器端部分是基于[ Node.js
```javascript

module.exports = {
'ACCESS_KEY': '<Your Access Key>',
'SECRET_KEY': '<Your Secret Key>',
'Bucket_Name': '<Your Bucket Name>',
'AccessKey': '<Your Access Key>',
'SecretKey': '<Your Secret Key>',
'Bucket': '<Your Bucket Name>',
'Port': 19110,
'Uptoken_Url': '<Your Uptoken_Url>', // demo 启动后会在本地 /uptoken 上提供获取 uptoken 的接口,所以这里可以填 'uptoken'
'UptokenUrl': '<Your Uptoken_Url>', // demo 启动后会在本地 /uptoken 上提供获取 uptoken 的接口,所以这里可以填 'uptoken'
'Domain': '<Your Bucket Domain>' // Bucket 的外链默认域名,在 Bucket 的内容管理里查看,如:'http://xxx.bkt.clouddn.com/'
}

Expand Down
26 changes: 11 additions & 15 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qiniu",
"description": "Javascript SDK for Qiniu Resource (Cloud) Storage API",
"version": "v1.0.20",
"version": "v1.0.21",
"main": "dist/qiniu.js",
"moduleType": [
"globals"
Expand All @@ -22,20 +22,16 @@
"upload"
],
"authors": "sdk@qiniu.com",
"contributors": [
{
"name": "luoyeshu0507",
"email": "lizhiwei@qiniu.com"
},
{
"name": "codedogfish",
"email": "jackyu@qiniu.com"
},
{
"name": "dengchenhua",
"email": "dengchenhua@qiniu.com"
}
],
"contributors": [{
"name": "luoyeshu0507",
"email": "lizhiwei@qiniu.com"
}, {
"name": "codedogfish",
"email": "jackyu@qiniu.com"
}, {
"name": "jinxinxin",
"email": "jinxinxin@qiniu.com"
}],
"homepage": "https://github.com/qiniu/js-sdk",
"repository": {
"type": "git",
Expand Down
8 changes: 4 additions & 4 deletions demo/config.js.example
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
'ACCESS_KEY': '<Your Access Key>', // https://portal.qiniu.com/user/key
'SECRET_KEY': '<Your Secret Key>',
'Bucket_Name': '<Your Bucket Name>',
'AccessKey': '<Your Access Key>', // https://portal.qiniu.com/user/key
'SecretKey': '<Your Secret Key>',
'Bucket': '<Your Bucket Name>',
'Port': 19110,
'Uptoken_Url': 'uptoken',
'UptokenUrl': 'uptoken',
'Domain': '<Your Bucket Name>' // bucket domain eg:http://qiniu-plupload.qiniudn.com/
};
Loading