x_vars can not set to be a object

jackzhang1204 · May 4, 2014 · 5f216e9 · 5f216e9
1 parent d0b79fc
commit 5f216e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ qiniu-js-sdk
         //    'time' : function(up,file) {
         //        var time = (new Date()).getTime();
                   // do something with 'time'
-        //        returnt time;
+        //        return time;
         //    },
         //    'size' : function(up,file) {
         //        var size = file.size;

diff --git a/demo/js/qiniu.js b/demo/js/qiniu.js
@@ -350,7 +350,7 @@ function QiniuJsSDK() {
                         if (x_vars.hasOwnProperty(x_key)) {
                             if (typeof x_vars[x_key] === 'function') {
                                 multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);
-                            } else if (typeof x_vars[x_key] === 'string') {
+                            } else if (typeof x_vars[x_key] !== 'object') {
                                 multipart_params_obj['x:' + x_key] = x_vars[x_key];
                             }
                         }
@@ -507,7 +507,7 @@ function QiniuJsSDK() {
                             if (x_vars.hasOwnProperty(x_key)) {
                                 if (typeof x_vars[x_key] === 'function') {
                                     x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));
-                                } else if (typeof x_vars[x_key] === 'string') {
+                                } else if (typeof x_vars[x_key] !== 'object') {
                                     x_val = that.URLSafeBase64Encode(x_vars[x_key]);
                                 }
                                 x_vars_url += '/x:' + x_key + '/' + x_val;
@@ -525,6 +525,7 @@ function QiniuJsSDK() {
                         if (ajax.readyState === 4) {
                             if (ajax.status === 200) {
                                 var info = ajax.responseText;
+
                                 if (FileUploaded_Handler) {
                                     FileUploaded_Handler(up, file, info);
                                 }

diff --git a/src/qiniu.js b/src/qiniu.js
@@ -350,7 +350,7 @@ function QiniuJsSDK() {
                         if (x_vars.hasOwnProperty(x_key)) {
                             if (typeof x_vars[x_key] === 'function') {
                                 multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);
-                            } else if (typeof x_vars[x_key] === 'string') {
+                            } else if (typeof x_vars[x_key] !== 'object') {
                                 multipart_params_obj['x:' + x_key] = x_vars[x_key];
                             }
                         }
@@ -507,7 +507,7 @@ function QiniuJsSDK() {
                             if (x_vars.hasOwnProperty(x_key)) {
                                 if (typeof x_vars[x_key] === 'function') {
                                     x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));
-                                } else if (typeof x_vars[x_key] === 'string') {
+                                } else if (typeof x_vars[x_key] !== 'object') {
                                     x_val = that.URLSafeBase64Encode(x_vars[x_key]);
                                 }
                                 x_vars_url += '/x:' + x_key + '/' + x_val;
@@ -525,6 +525,7 @@ function QiniuJsSDK() {
                         if (ajax.readyState === 4) {
                             if (ajax.status === 200) {
                                 var info = ajax.responseText;
+
                                 if (FileUploaded_Handler) {
                                     FileUploaded_Handler(up, file, info);
                                 }