From 5e02816c09832bdc1646f02b35a08830a1e53424 Mon Sep 17 00:00:00 2001 From: lealife Date: Fri, 30 Oct 2015 14:41:01 +0800 Subject: [PATCH] v1.3.1 release --- Gulpfile.js | 6 +- app/views/note/note.html | 15 +- public/album/js/main.all.js | 12 +- public/js/app.min.js | 8 +- public/js/dep.min.js | 2 +- public/js/markdown.min.js | 29 +- public/js/plugins/main.min.js | 4 +- public/tinymce/plugins/paste/plugin.dev.js | 2 +- public/tinymce/plugins/paste/plugin.js | 10 +- .../plugins/spellchecker/plugin.dev.js | 2 +- public/tinymce/plugins/spellchecker/plugin.js | 4 +- public/tinymce/plugins/table/plugin.dev.js | 2 +- public/tinymce/plugins/table/plugin.js | 10 +- public/tinymce/skins/custom/skin.ie7.dev.less | 39 ++ .../tinymce/skins/custom/skin.modern.dev.less | 39 ++ public/tinymce/tinymce.dev.js | 2 +- public/tinymce/tinymce.full.js | 461 ++++++------------ public/tinymce/tinymce.full.min.js | 2 +- public/tinymce/tinymce.jquery.dev.js | 2 +- public/tinymce/tinymce.jquery.js | 216 ++++---- public/tinymce/tinymce.js | 216 ++++---- 21 files changed, 504 insertions(+), 579 deletions(-) create mode 100644 public/tinymce/skins/custom/skin.ie7.dev.less create mode 100644 public/tinymce/skins/custom/skin.modern.dev.less diff --git a/Gulpfile.js b/Gulpfile.js index be99a7c..118f7e3 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -306,8 +306,8 @@ gulp.task('minifycss', function() { }); // tinymce -// !! You must has tinymce_dev on public/ -var tinymceBase = base + '/tinymce_dev'; +// please set the right path on your own env +var tinymceBase = '/Users/life/leanote/leanote-tools/tinymce_4.1.9_leanote_public'; gulp.task('tinymce', function() { // 先清理 fs.unlink(tinymceBase + '/js/tinymce/tinymce.dev.js'); @@ -317,7 +317,7 @@ gulp.task('tinymce', function() { var cp = require('child_process'); - var bundleCmd = 'grunt bundle --themes leanote --plugins autolink,link,leaui_image,leaui_mind,lists,hr,paste,searchreplace,leanote_nav,leanote_code,tabfocus,table,directionality,textcolor'; + var bundleCmd = 'grunt bundle --themes leanote --plugins autolink,link,leaui_image,lists,hr,paste,searchreplace,leanote_nav,leanote_code,tabfocus,table,directionality,textcolor'; // build cp.exec('grunt minify', {cwd: tinymceBase}, function(err, stdout, stderr) { console.log('stdout: ' + stdout); diff --git a/app/views/note/note.html b/app/views/note/note.html index e01102e..473176c 100644 --- a/app/views/note/note.html +++ b/app/views/note/note.html @@ -17,16 +17,16 @@ - + - + @@ -174,7 +174,7 @@ function log(o) { @@ -427,6 +427,7 @@ function log(o) {
+

@@ -571,7 +572,7 @@ function log(o) {
@@ -608,7 +609,7 @@ function log(o) {