From 41f63156ea88e438f5fb912289446de5f08e31b5 Mon Sep 17 00:00:00 2001
From: lealife <lifephp@gmail.com>
Date: Sat, 28 Nov 2015 16:32:29 +0800
Subject: [PATCH] =?UTF-8?q?tinymce=20=E4=B8=8D=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gulpfile.js                  | 2 +-
 app/views/note/note-dev.html | 3 ++-
 app/views/note/note.html     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gulpfile.js b/Gulpfile.js
index c99336e..39101d6 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -21,7 +21,7 @@ gulp.task('concatDepJs', function() {
     var jss = [
         'js/jquery-1.9.0.min.js',
         'js/jquery.ztree.all-3.5-min.js',
-        'tinymce/tinymce.full.min.js', // 使用打成的包, 加载速度快
+        // 'tinymce/tinymce.full.min.js', // 使用打成的包, 加载速度快
         // 'libs/ace/ace.js',
         'js/jQuery-slimScroll-1.3.0/jquery.slimscroll-min.js',
         'js/contextmenu/jquery.contextmenu-min.js',
diff --git a/app/views/note/note-dev.html b/app/views/note/note-dev.html
index ee109dd..f962b4e 100644
--- a/app/views/note/note-dev.html
+++ b/app/views/note/note-dev.html
@@ -887,9 +887,10 @@ var GlobalConfigs = {{.globalConfigs|jsonJs}};
 <script src="/js/jquery-1.9.0.min.js"></script>
 <script src="/js/jquery.ztree.all-3.5.js"></script>
 <script src="/js/object_id-min.js"></script>
-<script src="/public/tinymce/tinymce.js"></script>
 <!-- /dev -->
 
+<script src="/tinymce/tinymce.full.min.js"></script>
+
 <script src="/public/libs/ace/ace.js"></script>
 
 <!-- dev -->
diff --git a/app/views/note/note.html b/app/views/note/note.html
index 8500b43..064ee82 100644
--- a/app/views/note/note.html
+++ b/app/views/note/note.html
@@ -11,7 +11,7 @@
 <title>Leanote, {{msg $ "moto"}}</title>
 <link href="/css/bootstrap-min.css" rel="stylesheet" />
 <!-- 先加载, 没有样式, 宽度不定 -->
-<link rel="stylesheet" href="/tinymce/skins/custom/skin.min.css" rel="stylesheet"/>
+<link rel="stylesheet" href="/css/tinymce/skin.min.css" rel="stylesheet"/>
 <!-- leanote css -->
 <link href="/css/font-awesome-4.2.0/css/font-awesome-min.css" rel="stylesheet" />
 <link href="/css/zTreeStyle/zTreeStyle-min.css" rel="stylesheet" />
@@ -853,6 +853,7 @@ var tinyMCEPreInit = {base: '/public/tinymce', suffix: '.min'};
 </script>
 <script src="/js/i18n/msg.{{.locale}}.js"></script>
 <script src="/js/dep.min.js"></script>
+<script src="/tinymce/tinymce.full.min.js"></script>
 <script src="/public/libs/ace/ace.js"></script>
 <script src="/js/app.min.js"></script>
 <script>