From 8ccfcc3d722fca9b7159b1b1f7a3d38611398f60 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 14:52:55 +0800
Subject: [PATCH 1/9] =?UTF-8?q?bug#2847:=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=AF=B9=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E8=BF=9B=E8=A1=8C=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=9C=A8=E4=B8=AD=E9=97=B4=E7=94=A8=E8=99=9A?=
 =?UTF-8?q?=E7=BA=BF=E9=9A=94=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb  | 2 +-
 app/views/boards/_project_show.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 5beee8601..66875d0d7 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -92,7 +92,7 @@
 
           <div class="cl"></div>
 
-          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none">
+          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
             <ul>
               <%= render :partial => 'edit',locals:  {:topic => topic} %>
             </ul>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index d5a5a7882..fcc8fa0c8 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -80,7 +80,7 @@
           <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr" style="margin-right:10px;"><%= l(:button_reply) %></a>
         <% end %>
         <div class="cl"></div>
-        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none">
+        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
           <ul>
             <%= render :partial => 'edit',locals:  {:topic => topic} %>
           </ul>

From f39a98ee6851e9ed20f2171857df341990fa83bd Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 15:31:02 +0800
Subject: [PATCH 2/9] =?UTF-8?q?bug#2841:=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=EF=BC=9A=E4=B8=BB=E9=A2=98=E7=9A=84=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=92=8C=E6=8F=8F=E8=BF=B0=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E4=BD=8D=E7=BD=AE=E5=BA=94=E8=AF=A5=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/show.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index ba9583e7d..40d16cce4 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,4 +1,5 @@
 <style type="text/css">
+    div.talk_new .ke-container{margin-left:57px;}
     /*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 )}
@@ -127,13 +128,17 @@ function nh_init_board(params){
             var editor = params.kindutil.create(params.textarea, {
 //                allowPreviewEmoticons : false,
 //                allowImageUpload : false,
-                resizeType : 1,minWidth:"1px",width:"565px",height:"150px",
+                resizeType : 1,minWidth:"1px",width:"560px",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 userAgent = navigator.userAgent.toLowerCase();
+                  if(/trident/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

From 2fd00a10714150094c37536e386dc60292abcaad Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 16:19:11 +0800
Subject: [PATCH 3/9] ...

---
 app/views/boards/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 40d16cce4..1622bc22a 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,5 +1,5 @@
 <style type="text/css">
-    div.talk_new .ke-container{margin-left:57px;}
+    div.talk_new .ke-container{margin-left:2px;}
     /*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 )}

From 0434219518342e227e19da916e2829e336b00d90 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Mon, 15 Jun 2015 16:21:41 +0800
Subject: [PATCH 4/9] ...

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

diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 1622bc22a..bd4ece847 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -138,6 +138,8 @@ function nh_init_board(params){
                   var userAgent = navigator.userAgent.toLowerCase();
                   if(/trident/.test(userAgent)){
                     $("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  }else if(/chrome/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'57px'});
                   }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');

From e5774f573177982a7ac0f2339c5444613f076809 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 11:13:57 +0800
Subject: [PATCH 5/9] =?UTF-8?q?bug#2853:=E8=B0=B7=E6=AD=8C=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=EF=BC=9A=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=9A=E5=8F=91=E5=B8=83=E5=B8=A6=E6=9C=89=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=B1=95=E5=BC=80=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/boards/_course_show.html.erb  | 26 ++++++++++++++++++++++++-
 app/views/boards/_project_show.html.erb | 26 ++++++++++++++++++++++++-
 app/views/boards/show.html.erb          | 14 ++++++-------
 3 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 66875d0d7..7eed593d9 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -66,7 +66,31 @@
             <div class="cl"></div>
 
             <script>
-                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+              //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
+              //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
+              $(function(){
+                function nh_show_btn(){
+                  if($("#contentmessage<%=topic.id %>").height()>182){
+                    $("#project_show_<%= topic.id%>").show();
+                  }
+                }
+                var div = $("#contentmessage<%=topic.id %>");
+                var imgs = $('img',div);
+                var lens = imgs.length;
+                function nh_load_img_end(){
+                  lens--;
+                  if(lens <= 0){
+                    nh_show_btn();
+                  }
+                }
+                if(lens <= 0){
+                  nh_show_btn();
+                }else{
+                  $('img',div).load(function(){
+                    nh_load_img_end();
+                  });
+                }
+              });
             </script>
             <div  class="project_board_content break_word" id="content_<%=topic.id%>">
               <div id="contentmessage<%=topic.id %>" class="upload_img">
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index fcc8fa0c8..bb36c6f19 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -58,7 +58,31 @@
                 <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
             <% end %>
             <script>
-                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+                //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
+                //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
+                $(function(){
+                  function nh_show_btn(){
+                    if($("#contentmessage<%=topic.id %>").height()>182){
+                      $("#project_show_<%= topic.id%>").show();
+                    }
+                  }
+                  var div = $("#contentmessage<%=topic.id %>");
+                  var imgs = $('img',div);
+                  var lens = imgs.length;
+                  function nh_load_img_end(){
+                    lens--;
+                    if(lens <= 0){
+                      nh_show_btn();
+                    }
+                  }
+                  if(lens <= 0){
+                    nh_show_btn();
+                  }else{
+                    $('img',div).load(function(){
+                      nh_load_img_end();
+                    });
+                  }
+                });
             </script>
           </div>
           <div class="cl"></div>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index bd4ece847..fc18b00e8 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,5 +1,5 @@
 <style type="text/css">
-    div.talk_new .ke-container{margin-left:2px;}
+    /*div.talk_new .ke-container{margin-left:2px;}*/
     /*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 )}
@@ -135,12 +135,12 @@ function nh_init_board(params){
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
-                  var userAgent = navigator.userAgent.toLowerCase();
-                  if(/trident/.test(userAgent)){
-                    $("div.talk_new .ke-container").css({'margin-left':'55px'});
-                  }else if(/chrome/.test(userAgent)){
-                    $("div.talk_new .ke-container").css({'margin-left':'57px'});
-                  }
+                  //var userAgent = navigator.userAgent.toLowerCase();
+                  //if(/trident/.test(userAgent)){
+                    //$("div.talk_new .ke-container").css({'margin-left':'55px'});
+                  //}else if(/chrome/.test(userAgent)){
+                    //$("div.talk_new .ke-container").css({'margin-left':'57px'});
+                  //}
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

From 6cfc5d6a5d68434db36bc5b13d5ec2ebb1ef672e Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 12:01:06 +0800
Subject: [PATCH 6/9] ...

---
 app/views/boards/_form_course.html.erb  |  2 +-
 app/views/boards/_form_project.html.erb | 18 +++++++++---------
 app/views/boards/show.html.erb          | 12 +++++-------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/views/boards/_form_course.html.erb b/app/views/boards/_form_course.html.erb
index 65e750b57..423434b1b 100644
--- a/app/views/boards/_form_course.html.erb
+++ b/app/views/boards/_form_course.html.erb
@@ -39,7 +39,7 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
-  <div class="content">
+  <div class="content <%= replying ? '':'ml55' %>">
     <% if replying%>
 
         <%= f.text_area :content,
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 525869901..a6c8d405e 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -1,13 +1,13 @@
 <style>
-    .comment{
-        position: relative;
-        width: 330px;
-        padding: 10px;
-    }
-    .comment .ke-toolbar{
-        position: absolute;
-        bottom: -18px;
-    }
+    /*.comment{*/
+        /*position: relative;*/
+        /*width: 330px;*/
+        /*padding: 10px;*/
+    /*}*/
+    /*.comment .ke-toolbar{*/
+        /*position: absolute;*/
+        /*bottom: -18px;*/
+    /*}*/
 
 </style>
 <%= error_messages_for 'message' %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index fc18b00e8..10383ff00 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,5 +1,5 @@
 <style type="text/css">
-    /*div.talk_new .ke-container{margin-left:2px;}*/
+    div.talk_new .ke-container{margin-left:2px;}
     /*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 )}
@@ -135,12 +135,10 @@ function nh_init_board(params){
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
-                  //var userAgent = navigator.userAgent.toLowerCase();
-                  //if(/trident/.test(userAgent)){
-                    //$("div.talk_new .ke-container").css({'margin-left':'55px'});
-                  //}else if(/chrome/.test(userAgent)){
-                    //$("div.talk_new .ke-container").css({'margin-left':'57px'});
-                  //}
+                  var userAgent = navigator.userAgent.toLowerCase();
+                  if(/trident/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'0px'});
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

From 4e1cf3e16d838928b146a3539850d769a2b4c5bf Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 12:04:14 +0800
Subject: [PATCH 7/9] ...

---
 public/assets/kindeditor/kindeditor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index b2c13c3f7..1695b10f7 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5620,8 +5620,9 @@ _plugin('core', function(K) {
         afterUpload : function(data) {
             if (data.error === 0) {
                 var url = K.formatUrl(data.url, 'absolute');
-                //self.exec('insertimage', url, 'image','','','1','left');
-                self.insertHtml('<img src="'+url+'"/>');
+                self.exec('insertimage', url, 'image','','','1','');
+				//self.exec('insertimage', url, 'image','','','1','left');
+                //self.insertHtml('<img src="'+url+'"/>');
                 var asset_id  = data.asset_id;
                 if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) {
                     parent.document.getElementById('asset_id').value += asset_id.toString();

From 9606ce1caaceec7914a869e83f94cdf180f3cc9e Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 13:35:11 +0800
Subject: [PATCH 8/9] =?UTF-8?q?bug#2846:=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=89=93=E5=BC=80=E8=A1=A8=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=83=85=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=9A=84=E8=A1=A8=E6=83=85=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=A1=86=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/emoticons/emoticons.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js
index a9900668b..c89e0c6ee 100644
--- a/public/assets/kindeditor/plugins/emoticons/emoticons.js
+++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js
@@ -13,6 +13,7 @@ KindEditor.plugin('emoticons', function(K) {
 		allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons,
 		currentPageNum = 1;
 	self.clickToolbar(name, function() {
+		this.edit.focus();//���û����� �����ȡ�������� ����_getSel()Ϊ�� ���� 
 		var rows = 5, cols = 9, total = 135, startNum = 0,
 			cells = rows * cols, pages = Math.ceil(total / cells),
 			colsHalf = Math.floor(cols / 2),

From 0f8061094d7c3619b4a15c322d108cba21901765 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 16 Jun 2015 16:53:20 +0800
Subject: [PATCH 9/9] =?UTF-8?q?bug#2854:=E5=9C=A8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=90=8C=E6=97=B6=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=E5=92=8C=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96=E8=BE=91=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=9C=A8=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8=E4=B8=AD=E8=B4=B4=E5=9B=BE=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AA=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=AD?=
 =?UTF-8?q?=E5=8D=B4=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=AA=E8=B4=B4=E7=9A=84?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/plugins/paste/paste.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/assets/kindeditor/plugins/paste/paste.js b/public/assets/kindeditor/plugins/paste/paste.js
index f2d080dcf..943c0bbe7 100644
--- a/public/assets/kindeditor/plugins/paste/paste.js
+++ b/public/assets/kindeditor/plugins/paste/paste.js
@@ -293,7 +293,13 @@ https://github.com/layerssss/paste.js
 KindEditor.plugin('paste', function(K) {
     var editor = this,
         name = 'paste';
-    var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
+    //����ò�ƶ�༭���Ͳ����ͻ��
+    if(editor.edit == undefined || editor.edit.iframe == undefined){
+        return;
+    }
+    var contentWindow = editor.edit.iframe[0].contentWindow;
+    //var contentWindow = editor.iframeDoc;
+    //var contentWindow = document.getElementsByTagName('iframe')[0].contentWindow;
     var nodeBody = contentWindow.document.getElementsByTagName('body')[0];
     console.log(nodeBody);
     $(nodeBody).pastableContenteditable();