plugins compress

Gulpfile.js

@@ -64,11 +64,10 @@ gulp.task('concatAppJs', function() {
 
 // plugins压缩
 gulp.task('plugins', function() {
-    gulp.src(base + '/js/plugins/libs/*.js')
-        .pipe(uglify()) // 压缩
-        // .pipe(concat('main.min.js'))
-        .pipe(gulp.dest(base + '/js/plugins/libs-min'));
-
+    // gulp.src(base + '/js/plugins/libs/*.js')
+    //     .pipe(uglify()) // 压缩
+    //     // .pipe(concat('main.min.js'))
+    //     .pipe(gulp.dest(base + '/js/plugins/libs-min'));
 
     // 所有js合并成一个
      var jss = [
@@ -83,8 +82,9 @@ gulp.task('plugins', function() {
     for(var i in jss) {
         jss[i] = base + '/js/plugins/' + jss[i] + '.js';
     }
+    jss.push(base + '/js/plugins/libs-min/fileupload.js');
 
-     gulp.src(jss)
+    return gulp.src(jss)
         .pipe(uglify()) // 压缩
         .pipe(concat('main.min.js'))
         .pipe(gulp.dest(base + '/js/plugins'));
@@ -138,10 +138,15 @@ gulp.task('devToProHtml', function() {
         .pipe(replace(/<!-- pro_markdown_js -->/, '<script src="/js/markdown-v2.min.js"></script>')) // 替换
         .pipe(replace(/<!-- pro_tinymce_init_js -->/, "var tinyMCEPreInit = {base: '/public/tinymce', suffix: '.min'};")) // 替换
         .pipe(replace(/plugins\/main.js/, "plugins/main.min.js")) // 替换
-        // 连续两个空行换成一个空行, 没用
-        .pipe(replace(/\n\n/g, '\n'))
-        .pipe(replace(/\n\n/g, '\n'))
+        // 连续两个空行换成一个空行
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
+        .pipe(replace(/\r\n\r\n/g, '\r\n'))
         .pipe(replace('console.log(o);', ''))
+        .pipe(replace('console.trace(o);', ''))
         // .pipe(minifyHtml()) // 不行, 压缩后golang报错
         .pipe(rename('note.html'))
         .pipe(gulp.dest(noteProBase));
@@ -290,35 +295,6 @@ gulp.task('concatAlbumJs', function() {
         .pipe(gulp.dest(base + '/album/js'));
 });
 
-// plugins压缩
-gulp.task('plugins', function() {
-    gulp.src(base + '/js/plugins/libs/*.js')
-        .pipe(uglify()) // 压缩
-        // .pipe(concat('main.min.js'))
-        .pipe(gulp.dest(base + '/js/plugins/libs-min'));
-
-       
-    // 所有js合并成一个
-     var jss = [
-        'note_info',
-        'tips',
-        'history',
-        'attachment_upload',
-        'editor_drop_paste',
-        'main'
-    ];
-
-    for(var i in jss) {
-        jss[i] = base + '/js/plugins/' + jss[i] + '.js';
-    }
-
-     gulp.src(jss)
-        .pipe(uglify()) // 压缩
-        .pipe(concat('main.min.js'))
-        .pipe(gulp.dest(base + '/js/plugins'));
-});
-
-
 // tinymce
 // please set the right path on your own env
 var tinymceBase = '/Users/life/leanote/leanote-tools/tinymce_4.1.9_leanote_public';

public/js/plugins/attachment_upload.js

@@ -1,7 +1,7 @@
 // upload attachment
 // 依赖note
 var urlPrefix = UrlPrefix;
-define('attachment_upload', ['jquery.ui.widget', 'fileupload'], function(){
+define('attachment_upload', ['fileupload'], function(){
 	// Helper function that formats the file sizes
     function formatFileSize(bytes) {
         if (typeof bytes !== 'number') {

public/js/plugins/editor_drop_paste.js

@@ -1,7 +1,7 @@
 // for editor.
 // drag image to editor
 var urlPrefix = UrlPrefix; // window.location.protocol + "//" + window.location.host;
-define('editor_drop_paste', ['jquery.ui.widget', 'fileupload'], function() {
+define('editor_drop_paste', ['fileupload'], function() {
 
 	// 在toggle成pre或ace时
 	// 最后没有元素, 或者元素不是p, 则在最后插入之

public/js/plugins/main.js

@@ -9,9 +9,9 @@ requirejs.config({
         'editor_drop_paste': 'js/plugins/editor_drop_paste',
         'attachment_upload': 'js/plugins/attachment_upload',
         
-        'jquery.ui.widget': 'js/plugins/libs-min/jquery.ui.widget',
-        'fileupload': 'js/plugins/libs-min/jquery.fileupload',
-        'iframe-transport': 'js/plugins/libs-min/jquery.iframe-transport',
+        // 'jquery.ui.widget': 'js/plugins/libs-min/jquery.ui.widget',
+        'fileupload': 'js/plugins/libs-min/fileupload',
+        // 'iframe-transport': 'js/plugins/libs-min/jquery.iframe-transport',
 
         'note_info': 'js/plugins/note_info',
         'tips': 'js/plugins/tips',
@@ -19,7 +19,7 @@ requirejs.config({
     },
     shim: {
         // life
-        'fileupload': {deps: ['jquery.ui.widget', 'iframe-transport']},
+        // 'fileupload': {deps: ['jquery.ui.widget', 'iframe-transport']},
     }
 });