x_val can be not a func

SunLn · SunLn · commit d0b79fc39b9f · 2014-05-04T11:19:47.000+08:00
diff --git a/demo/js/qiniu.js b/demo/js/qiniu.js
@@ -347,8 +347,12 @@ function QiniuJsSDK() {
                 var x_vars = op.x_vars;
                 if (x_vars !== undefined && typeof x_vars === 'object') {
                     for (var x_key in x_vars) {
-                        if (x_vars.hasOwnProperty(x_key) && typeof x_vars[x_key] === 'function') {
-                            multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);
+                        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') {
+                                multipart_params_obj['x:' + x_key] = x_vars[x_key];
+                            }
                         }
                     }
                 }
@@ -496,11 +500,16 @@ function QiniuJsSDK() {
                     }
 
                     var x_vars = op.x_vars,
+                        x_val = '',
                         x_vars_url = '';
                     if (x_vars !== undefined && typeof x_vars === 'object') {
                         for (var x_key in x_vars) {
-                            if (x_vars.hasOwnProperty(x_key) && typeof x_vars[x_key] === 'function') {
-                                var x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));
+                            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') {
+                                    x_val = that.URLSafeBase64Encode(x_vars[x_key]);
+                                }
                                 x_vars_url += '/x:' + x_key + '/' + x_val;
                             }
                         }
diff --git a/src/qiniu.js b/src/qiniu.js
@@ -347,8 +347,12 @@ function QiniuJsSDK() {
                 var x_vars = op.x_vars;
                 if (x_vars !== undefined && typeof x_vars === 'object') {
                     for (var x_key in x_vars) {
-                        if (x_vars.hasOwnProperty(x_key) && typeof x_vars[x_key] === 'function') {
-                            multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);
+                        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') {
+                                multipart_params_obj['x:' + x_key] = x_vars[x_key];
+                            }
                         }
                     }
                 }
@@ -496,11 +500,16 @@ function QiniuJsSDK() {
                     }
 
                     var x_vars = op.x_vars,
+                        x_val = '',
                         x_vars_url = '';
                     if (x_vars !== undefined && typeof x_vars === 'object') {
                         for (var x_key in x_vars) {
-                            if (x_vars.hasOwnProperty(x_key) && typeof x_vars[x_key] === 'function') {
-                                var x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));
+                            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') {
+                                    x_val = that.URLSafeBase64Encode(x_vars[x_key]);
+                                }
                                 x_vars_url += '/x:' + x_key + '/' + x_val;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,12 @@ function QiniuJsSDK() {`
`347`	`347`	`var x_vars = op.x_vars;`
`348`	`348`	`if (x_vars !== undefined && typeof x_vars === 'object') {`
`349`	`349`	`for (var x_key in x_vars) {`
`350`		`- if (x_vars.hasOwnProperty(x_key) && typeof x_vars[x_key] === 'function') {`
`351`		`- multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);`
	`350`	`+ if (x_vars.hasOwnProperty(x_key)) {`
	`351`	`+ if (typeof x_vars[x_key] === 'function') {`
	`352`	`+ multipart_params_obj['x:' + x_key] = x_vars[x_key](up, file);`
	`353`	`+ } else if (typeof x_vars[x_key] === 'string') {`
	`354`	`+ multipart_params_obj['x:' + x_key] = x_vars[x_key];`
	`355`	`+ }`
`352`	`356`	`}`
`353`	`357`	`}`
`354`	`358`	`}`
`@@ -496,11 +500,16 @@ function QiniuJsSDK() {`
`496`	`500`	`}`
`497`	`501`
`498`	`502`	`var x_vars = op.x_vars,`
	`503`	`+ x_val = '',`
`499`	`504`	`x_vars_url = '';`
`500`	`505`	`if (x_vars !== undefined && typeof x_vars === 'object') {`
`501`	`506`	`for (var x_key in x_vars) {`
`502`		`- if (x_vars.hasOwnProperty(x_key) && typeof x_vars[x_key] === 'function') {`
`503`		`- var x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));`
	`507`	`+ if (x_vars.hasOwnProperty(x_key)) {`
	`508`	`+ if (typeof x_vars[x_key] === 'function') {`
	`509`	`+ x_val = that.URLSafeBase64Encode(x_vars[x_key](up, file));`
	`510`	`+ } else if (typeof x_vars[x_key] === 'string') {`
	`511`	`+ x_val = that.URLSafeBase64Encode(x_vars[x_key]);`
	`512`	`+ }`
`504`	`513`	`x_vars_url += '/x:' + x_key + '/' + x_val;`
`505`	`514`	`}`
`506`	`515`	`}`