Q.js 微调

Signed-off-by: Devin <[email protected]>

app.js

@@ -7,7 +7,7 @@ var http = require('http'),
     app = express();
 
 app.use(express.static('./www'));
-app.use(express.bodyParser({ uploadDir: './upload', limit: '500mb' }));
+app.use(express.bodyParser({ uploadDir: './upload', limit: '2000mb' }));
 
 app.get('/', function (req, res) {
     res.redirect("/demo/default.html");
@@ -18,7 +18,7 @@ app.post('/upload', function (req, res) {
         var path = f.path,
             fileName = f.name;
 
-        console.log(fileName + " => " + path + "     | " + Q.formatSize(f.size).text);
+        console.log(fileName + " => " + path + "     | " + Q.formatSize(f.size));
     });
 
     var user = req.body["user"],

lib/Q.js

@@ -1,9 +1,9 @@
 /*
 * Q.js for Node
 * author:[email protected]
-* update:2014/09/18 15:33
+* update:2015/07/15 10:19
 */
-(function (global, undefined) {
+(function (undefined) {
     "use strict";
 
     var toString = Object.prototype.toString,
@@ -36,6 +36,8 @@
     //扩展对象
     //forced:是否强制扩展
     function extend(destination, source, forced) {
+        if (!destination || !source) return;
+
         for (var key in source) {
             if (key == undefined || !has.call(source, key)) continue;
 
@@ -99,7 +101,7 @@
         }
 
         if (level && size < stepNow) {
-            stepNow /= (isNum ? steps : steps[steps.length - 1]);
+            stepNow /= (isNum ? steps : steps.last());
             level--;
         }
 
@@ -110,22 +112,24 @@
 
     //格式化数字输出,将数字转为合适的单位输出,默认按照1024层级转为文件单位输出
     function formatSize(size, ops) {
-        ops = ops || {};
+        ops = ops === true ? { all: true } : ops || {};
 
-        if (isNaN(size) || size == undefined || size < 0) return { text: ops.error || "--" };
+        if (isNaN(size) || size == undefined || size < 0) {
+            var error = ops.error || "--";
 
-        var pl = parseLevel(size, ops.steps, ops.limit),
+            return ops.all ? { text: error } : error;
+        }
 
-            digit = ops.digit,
+        var pl = parseLevel(size, ops.steps, ops.limit),
 
             value = pl.value,
-            text = value.toFixed(isUInt(digit) || digit == 0 ? digit : 2);
+            text = value.toFixed(def(ops.digit, 2));
 
         if (ops.trim !== false && text.lastIndexOf(".") != -1) text = text.replace(/\.?0+$/, "");
 
-        pl.text = text + (ops.join || "") + (ops.units || UNITS_FILE_SIZE)[pl.level + (ops.levelFix || 0)];
+        pl.text = text + (ops.join || "") + (ops.units || UNITS_FILE_SIZE)[pl.level + (ops.start || 0)];
 
-        return pl;
+        return ops.all ? pl : pl.text;
     }
 
     //---------------------- export ----------------------
@@ -145,10 +149,8 @@
         formatSize: formatSize
     };
 
-    global.Q = Q;
-
     if (typeof module === "object" && typeof module.exports === "object") {
         module.exports = Q;
     }
 
-})(this);
+})();

www/demo/custom.html

@@ -32,13 +32,9 @@
 
     <script type="text/javascript">
         var Uploader = Q.Uploader,
-
+            formatSize = Q.formatSize,
             boxView = document.getElementById("upload-info");
 
-        function formatSize(size) {
-            return Q.formatSize(size).text;
-        }
-
         new Uploader({
             url: UPLOAD_URL,
             target: document.getElementById("upload-target"),