From c92bd138bb3423bf7c6e97caf98fb130f73a7b4b Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Wed, 24 Jun 2015 16:12:45 +0800
Subject: [PATCH] =?UTF-8?q?bug#2915:=E6=AD=A3=E5=BC=8F=E7=89=88=E2=80=94?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=EF=BC=9A=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=86=85=E5=AE=B9=E8=BF=87=E5=A4=9A=E4=B8=94=E5=B8=A6?=
 =?UTF-8?q?=E6=9C=89=E8=A1=A8=E6=83=85=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E6=95=B4=EF=BC=8C=E4=B9=9F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=8F=90=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  | 27 ++++++++++++++++---------
 app/views/boards/_project_show.html.erb | 27 ++++++++++++++++---------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 7eed593d9..417a5a8ba 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -70,26 +70,35 @@
               //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
               $(function(){
                 function nh_show_btn(){
-                  if($("#contentmessage<%=topic.id %>").height()>182){
-                    $("#project_show_<%= topic.id%>").show();
+                  if($("#project_show_<%= topic.id%>").is(':hidden')){
+                    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{
+//                  lens--;
+//                  if(lens <= 0){
+//                    nh_show_btn();
+//                  }
+                }
+                if(lens > 0){
                   $('img',div).load(function(){
                     nh_load_img_end();
                   });
                 }
+                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%>">
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index bb36c6f19..03d283031 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -62,26 +62,35 @@
                 //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
                 $(function(){
                   function nh_show_btn(){
-                    if($("#contentmessage<%=topic.id %>").height()>182){
-                      $("#project_show_<%= topic.id%>").show();
+                    if($("#project_show_<%= topic.id%>").is(':hidden')){
+                      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{
+//                    lens--;
+//                    if(lens <= 0){
+//                      nh_show_btn();
+//                    }
+                  }
+                  if(lens > 0){
                     $('img',div).load(function(){
                       nh_load_img_end();
                     });
                   }
+                  nh_show_btn();
+//                  if(lens <= 0){
+//                    nh_show_btn();
+//                  }else{
+//                    $('img',div).load(function(){
+//                      nh_load_img_end();
+//                    });
+//                  }
                 });
             </script>
           </div>