Merge a09a1b0 into c30d13a

node-modules · Jan 6, 2015 · b6a4180 · b6a4180
2 parents c30d13a + a09a1b0
commit b6a4180
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ var client = qn.create({
   accessKey: 'your access key',
   secretKey: 'your secret key',
   bucket: 'your bucket name',
-  domain: 'http://{bucket}.u.qiniudn.com',
+  origin: 'http://{bucket}.u.qiniudn.com',
   // timeout: 3600000, // default rpc timeout: one hour, optional
   // if your app outside of China, please set `uploadURL` to `http://up.qiniug.com/`
   // uploadURL: 'http://up.qiniu.com/',

diff --git a/lib/client.js b/lib/client.js
@@ -22,13 +22,13 @@ function Qiniu(options) {
     throw new TypeError('required accessKey, secretKey and bucket');
   }
 
-  options.domain = options.domain || null;
+  options.origin = options.origin || null;
   options.timeout = options.timeout || DEFAULT_TIMEOUT;
   options.downloadTimeout = options.downloadTimeout || DEFAULT_TIMEOUT;
   this.options = options;
   this._uploadURL = options.uploadURL || 'http://up.qiniu.com/';
 
-  this._baseURL = options.domain || 'http://' + options.bucket + '.qiniudn.com';
+  this._baseURL = options.origin || 'http://' + options.bucket + '.qiniudn.com';
   if (this._baseURL[this._baseURL.length - 1] !== '/') {
     this._baseURL += '/';
   }