Merge pull request #14 from qiniupd/8351_add_x_val_feature

SunLn · SunLn · commit 5114b2ad89b6 · 2014-05-04T11:43:13.000+08:00
8351 add x val feature again
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/main.js b/demo/js/main.js
@@ -16,6 +16,14 @@ var uploader = Qiniu.uploader({
     domain: 'http://qiniu-plupload.qiniudn.com/',
     // unique_names: true,
     // save_key: true,
+    // x_vars: {
+    //     'id': '1234',
+    //     'time': function(up, file) {
+    //         var time = (new Date()).getTime();
+    //         // do something with 'time'
+    //         return time;
+    //     },
+    // },
     auto_start: true,
     init: {
         'FilesAdded': function(up, files) {
@@ -216,4 +224,4 @@ $(function() {
         return false;
     });
 
-});
+});
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] !== 'object') {
+                                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] !== 'object') {
+                                    x_val = that.URLSafeBase64Encode(x_vars[x_key]);
+                                }
                                 x_vars_url += '/x:' + x_key + '/' + x_val;
                             }
                         }
@@ -516,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
@@ -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] !== 'object') {
+                                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] !== 'object') {
+                                    x_val = that.URLSafeBase64Encode(x_vars[x_key]);
+                                }
                                 x_vars_url += '/x:' + x_key + '/' + x_val;
                             }
                         }
@@ -516,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
`@@ -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] !== 'object') {`
	`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] !== 'object') {`
	`511`	`+ x_val = that.URLSafeBase64Encode(x_vars[x_key]);`
	`512`	`+ }`
`504`	`513`	`x_vars_url += '/x:' + x_key + '/' + x_val;`
`505`	`514`	`}`
`506`	`515`	`}`
`@@ -516,6 +525,7 @@ function QiniuJsSDK() {`
`516`	`525`	`if (ajax.readyState === 4) {`
`517`	`526`	`if (ajax.status === 200) {`
`518`	`527`	`var info = ajax.responseText;`
	`528`	`+`
`519`	`529`	`if (FileUploaded_Handler) {`
`520`	`530`	`FileUploaded_Handler(up, file, info);`
`521`	`531`	`}`