x_vars can not set to be a object

SunLn · SunLn · commit 5f216e91892e · 2014-05-04T11:35:38.000+08:00
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);
                                 }

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ function QiniuJsSDK() {`
`350`	`350`	`if (x_vars.hasOwnProperty(x_key)) {`
`351`	`351`	`if (typeof x_vars[x_key] === 'function') {`
`352`	`352`	`multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);`
`353`		`- } else if (typeof x_vars[x_key] === 'string') {`
	`353`	`+ } else if (typeof x_vars[x_key] !== 'object') {`
`354`	`354`	`multipart_params_obj['x:' + x_key] = x_vars[x_key];`
`355`	`355`	`}`
`356`	`356`	`}`
`@@ -507,7 +507,7 @@ function QiniuJsSDK() {`
`507`	`507`	`if (x_vars.hasOwnProperty(x_key)) {`
`508`	`508`	`if (typeof x_vars[x_key] === 'function') {`
`509`	`509`	`x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));`
`510`		`- } else if (typeof x_vars[x_key] === 'string') {`
	`510`	`+ } else if (typeof x_vars[x_key] !== 'object') {`
`511`	`511`	`x_val = that.URLSafeBase64Encode(x_vars[x_key]);`
`512`	`512`	`}`
`513`	`513`	`x_vars_url += '/x:' + x_key + '/' + x_val;`
`@@ -525,6 +525,7 @@ function QiniuJsSDK() {`
`525`	`525`	`if (ajax.readyState === 4) {`
`526`	`526`	`if (ajax.status === 200) {`
`527`	`527`	`var info = ajax.responseText;`
	`528`	`+`
`528`	`529`	`if (FileUploaded_Handler) {`
`529`	`530`	`FileUploaded_Handler(up, file, info);`
`530`	`531`	`}`