调整格式

Author: 2betop

.jshintrc

@@ -4,12 +4,12 @@
     "camelcase"     : true,
     "curly"         : true,
     "eqeqeq"        : true,
-    "forin"         : true,
+    "forin"         : false,
     "immed"         : false,
     "indent"        : 4,
     "latedef"       : false,
     "newcap"        : false,
-    "noarg"         : true,
+    "noarg"         : false,
     "noempty"       : true,
     "nonew"         : false,
     "plusplus"      : false,
@@ -27,7 +27,7 @@
     "asi"           : false,
     "boss"          : false,
     "debug"         : false,
-    "eqnull"        : false,
+    "eqnull"        : true,
     "es5"           : false,
     "esnext"        : false,
 
@@ -66,17 +66,17 @@
     "onevar"        : true,
     "passfail"      : false,
     "white"         : true,
-    "predef"        : [ "require", "define", "module" ],
+    "predef"        : [ "require", "define", "module", "URL", "XDomainRequest", "ActiveXObject" ],
     "withstmt"    : false,
     "zepto" : true,
     "assignvarfirst" : true,
     "varnewline": true,
     "strictchain": true,
     "strictindent": true,
     "operatorend": true,
-    "strictlinebreak": true,
-    "assignthisto"    : "me",
-    "assignexceptionto"    : "ex",
+    "strictlinebreak": false,
+    "assignthisto"    : false,
+    "assignexceptionto"    : false,
     "strictcomment"    : true,
     "fileoverview"    : true,
     "novoid"    : true

Gruntfile.js

@@ -11,66 +11,26 @@ module.exports = function(grunt) {
                 banner: '/* WebUploader <%= pkg.version %> */\n(function( window, undefined ) {\n',
                 footer: '\n})( this );',
                 separator: '\n\n',
-                process: function( src, filepath ) {
-                    return src.replace( /@version@/g, grunt.config.get('pkg.version') )
-                            .replace( /(^|\r\n|\r|\n)/g, '$1    ');
-                },
-
-                // 排序，让被依赖的文件移至最上面。
-                filesFilter: function( f, files ) {
-                    var cwd = f.cwd || '',
-                        ret = [],
-                        process = function( file ) {
-                            var fileinfo = path.join( cwd, file ),
-                                str, matches, depends, idx;
-
-                            if ( !grunt.file.exists( fileinfo ) ) {
-                                return;
-                            }
-
-                            ret.push( file );
-
-                            str = grunt.file.read( fileinfo );
-                            matches = str.match(/@import\s(.*?)$/im);
-                            if (matches) {
-                                depends = matches[1]
-
-                                    // 多个依赖用道号隔开
-                                    .split(/\s*,\s*/g);
 
-                                idx = ret.indexOf( file );
-                                [].splice.apply( ret, [ idx, 0 ].concat( depends ) );
-                                depends.forEach( process );
-                            }
-
-
-                        };
-                    // console.log( files );
-                    files.forEach( process );
-                    ret = ret.filter(function( item, idx, arr ){
-                        return idx === arr.indexOf( item );
-                    });
-
-                    return ret;
+                // 调整缩进
+                process: function( src, filepath ) {
+                    return src.replace( /(^|\r\n|\r|\n)/g, '$1    ');
                 }
             },
+
             all: {
                 options: {
-                    process: function( src, filepath ) {
+                    process: function( src ) {
                         return src
-                            .replace( /webuploader\/jq-bridge/g, 'jQuery' )
-                            .replace( /@version@/g, grunt.config.get('pkg.version') )
-                            .replace( /(^|\r\n|\r|\n)/g, '$1    ');
+                                // .replace('jQuery', 'jq-bridge')
+                                .replace( /(^|\r\n|\r|\n)/g, '$1    ');
                     }
                 },
 
                 cwd: 'src',
 
                 src: [
-                    'amd.js',
                     // 'jq-bridge.js',
-                    'base.js',
-                    // 'promise.js',
 
                     // 把剩余的打包进来。
                     'widgets/filepicker.js',
@@ -89,28 +49,15 @@ module.exports = function(grunt) {
                 options: {
                     banner: '/* WebUploader <%= pkg.version %> */\n(function( window, undefined ) {\n',
                     footer: '\n})( this );\nexports = this.WebUploader;',
-                    separator: '\n\n',
-                    process: function( src, filepath ) {
-                        return src
-                            .replace( /webuploader\/jq-bridge/g, 'jQuery' )
-                            .replace( /@version@/g, grunt.config.get('pkg.version') )
-                            .replace( /(^|\r\n|\r|\n)/g, '$1    ');
-                    }
                 },
 
                 cwd: 'src',
 
                 src: [
-                    'amd.js',
-                    // 'jq-bridge.js',
-                    'base.js',
-                    // 'promise.js',
-
                     // 把剩余的打包进来。
                     'widgets/filepicker.js',
                     '**/*.js',
 
-
                     '!exports.js',
                     'exports.js'
                 ],
@@ -120,16 +67,35 @@ module.exports = function(grunt) {
             },
 
             music: {
+                cwd: 'src',
+
+                src: [
+                    'amd.js',
+                    'base.js',
+
+                    // 把剩余的打包进来。
+                    'widgets/filepicker.js',
+                    'widgets/filednd.js',
+                    'widgets/queue.js',
+                    'widgets/runtime.js',
+                    'widgets/upload.js',
+
+                    'runtime/html5/blob.js',
+                    'runtime/html5/transport.js',
+                    'runtime/html5/filepicker.js',
+                    'runtime/html5/dnd.js',
+
+                    '!exports.js',
+                    'exports.js'
+                ],
+
+                dest: 'examples/music/webuploader.js'
+            },
+
+            wenku: {
                 options: {
                     banner: '/* WebUploader <%= pkg.version %> */\n(function( window, undefined ) {\n',
-                    footer: '\n})( this );',
-                    separator: '\n\n',
-                    process: function( src, filepath ) {
-                        return src
-                            .replace( /webuploader\/jq-bridge/g, 'jQuery' )
-                            .replace( /@version@/g, grunt.config.get('pkg.version') )
-                            .replace( /(^|\r\n|\r|\n)/g, '$1    ');
-                    }
+                    footer: '\n})( this );exports = WebUploader;'
                 },
 
                 cwd: 'src',
@@ -158,7 +124,7 @@ module.exports = function(grunt) {
                 ],
 
 
-                dest: 'examples/music/webuploader.js'
+                dest: '/Users/liaoxuezhi/www/wenku/common/static/common/ui/js_core/upload/webuploader.js'
             }
 
 
@@ -186,7 +152,7 @@ module.exports = function(grunt) {
 
             concat: {
                 files: ['src/**/*.js', 'Gruntfile.js'],
-                tasks: ['concat:music'],
+                tasks: ['concat:wenku'],
             }
         },
 
@@ -210,9 +176,6 @@ module.exports = function(grunt) {
         }
     });
 
-    // 加载build目录下的所有task
-    // grunt.loadTasks( 'tasks' );
-
     // 负责报告文件大小
     grunt.loadNpmTasks( 'grunt-size' );
 
@@ -223,7 +186,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks( 'grunt-contrib-watch' );
 
     // 加载build目录下的所有task
-    grunt.loadTasks( 'tasks' );
+    grunt.loadTasks( 'build/tasks' );
 
     // Default task(s).
     grunt.registerTask( 'default', [ 'jsbint:all', 'concat:all' ] );