From 18e41e562a3a71d877aa16c3f03b8831e1dabcc6 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 5 Jun 2015 14:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E5=8A=A0=E4=B8=8A=E5=85=B6=E4=BB=96=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/show.html.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 589a0f25d..bf276925a 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,11 +1,11 @@
 <style type="text/css">
-    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
     div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
     span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    div.ke-toolbar .ke-outline{border:none;}
+    div.ke-toolbar .ke-outline{border:none;}*/
     .break_word {width:100%;}
 </style>
 <script type="text/javascript">
@@ -33,7 +33,8 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
@@ -123,21 +124,20 @@ function nh_init_board(params){
         if(params.textarea.data('init') == undefined){
             //初始化编辑器
             var editor = params.kindutil.create(params.textarea, {
-                resizeType : 1,
-                allowPreviewEmoticons : false,
-                allowImageUpload : false,
-                minWidth:"1px",
-                width:"565px",
-                items : ['emoticons'],
+//                allowPreviewEmoticons : false,
+//                allowImageUpload : false,
+                resizeType : 1,minWidth:"1px",width:"565px",height:"150px",
+                allowFileManager:true,uploadJson:"/kindeditor/upload",
+                fileManagerJson:"/kindeditor/filemanager",
                 afterChange:function(){//按键事件
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
-                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
-                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
-                    params.toolbar_container.append(toolbar);
+//                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+//                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+//                    params.toolbar_container.append(toolbar);
                 }
-            });
+            }).loadPlugin('paste');
 
             //主题输入框按键事件
             params.inputsubject.keyup(function(){