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] =?UTF-8?q?bug#2853:=E8=B0=B7=E6=AD=8C=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=EF=BC=9A=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=91=E5=B8=83=E5=B8=A6=E6=9C=89=E5=A4=A7=E5=9B=BE?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=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);