From 1eafad6468e336424a29069ca60f6e34523f1b10 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 18 Mar 2016 10:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=BB=8F=E8=BF=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8E=EF=BC=8C=E6=8C=81=E7=BB=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8D=8A=E7=A7=92?=
 =?UTF-8?q?=E9=92=9F=EF=BC=8C=E4=BB=A5=E4=BE=BF=E7=94=A8=E6=88=B7=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E6=93=8D=E4=BD=9C=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_activity.html.erb         | 13 ++++++++++++-
 app/views/layouts/new_base_user.html.erb            | 13 ++++++++++++-
 app/views/org_subfields/_show_details.html.erb      | 13 +------------
 app/views/organizations/_org_activities.html.erb    | 12 ------------
 .../organizations/_org_left_subfield_list.html.erb  | 13 ++++++++++++-
 app/views/projects/_project_activities.html.erb     | 13 ++++++++++++-
 app/views/users/_user_activities.html.erb           | 13 -------------
 7 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/app/views/courses/_course_activity.html.erb b/app/views/courses/_course_activity.html.erb
index d65c0b3ab..bdbcabff0 100644
--- a/app/views/courses/_course_activity.html.erb
+++ b/app/views/courses/_course_activity.html.erb
@@ -2,6 +2,8 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 <script>
+    var onUserCard = false;
+    var onImage = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -10,15 +12,24 @@
             $(".relatePInfo").css("display","none");
         })
         $(".homepagePostPortrait").mouseover(function(){
+            onImage = true;
             $(this).children(".userCard").css("display","block");
         })
         $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
+            var cur = $(this);
+            onImage = false;
+            setTimeout(function(){
+                if (onUserCard == false && onImage == false){
+                    $(cur).children(".userCard").css("display", "none");
+                }
+            }, 500);
         })
         $(".userCard").mouseover(function(){
+            onUserCard = true;
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
+            onUserCard = false;
             $(this).css("display","none");
         })
         $(".coursesLineGrey").mouseover(function(){
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index eaf58ed7e..66f2fc23d 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -28,6 +28,8 @@
     });
   </script>
   <script>
+      var onUserCard = false;
+      var onImage = false;
       $(document).ready(function(){
           $("#relateProject,.relatePInfo").mouseover(function(){
               $(".relatePInfo").css("display","block");
@@ -36,15 +38,24 @@
               $(".relatePInfo").css("display","none");
           })
           $(".homepagePostPortrait").mouseover(function(){
+              onImage = true;
               $(this).children(".userCard").css("display","block");
           })
           $(".homepagePostPortrait").mouseout(function(){
-              $(this).children(".userCard").css("display","none");
+              var cur = $(this);
+              onImage = false;
+              setTimeout(function(){
+                  if (onUserCard == false && onImage == false) {
+                      $(cur).children(".userCard").css("display","none");
+                  }
+              },500);
           })
           $(".userCard").mouseover(function(){
+              onUserCard = true;
               $(this).css("display","block");
           })
           $(".userCard").mouseout(function(){
+              onUserCard = false;
               $(this).css("display","none");
           })
           $(".coursesLineGrey").mouseover(function(){
diff --git a/app/views/org_subfields/_show_details.html.erb b/app/views/org_subfields/_show_details.html.erb
index f7f5d0748..1c103855d 100644
--- a/app/views/org_subfields/_show_details.html.erb
+++ b/app/views/org_subfields/_show_details.html.erb
@@ -1,4 +1,5 @@
 <script>
+    var onUserCard = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -6,18 +7,6 @@
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
         })
-        $(".homepagePostPortrait").mouseover(function(){
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
-        })
-        $(".userCard").mouseover(function(){
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            $(this).css("display","none");
-        })
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
         })
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index c5ec9cd4a..a3e62fd16 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -6,18 +6,6 @@
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
         })
-        $(".homepagePostPortrait").mouseover(function(){
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
-        })
-        $(".userCard").mouseover(function(){
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            $(this).css("display","none");
-        })
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
         })
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 3db6ffb13..53003c85a 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -1,4 +1,6 @@
 <script>
+    var onUserCard = false;
+    var onImage = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -7,15 +9,24 @@
             $(".relatePInfo").css("display","none");
         })
         $(".homepagePostPortrait").mouseover(function(){
+            onImage = true;
             $(this).children(".userCard").css("display","block");
         })
         $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
+            var cur = $(this);
+            onImage = false;
+            setTimeout(function(){
+                if (onUserCard == false && onImage == false) {
+                    $(cur).children(".userCard").css("display", "none");
+                }
+            }, 500);
         })
         $(".userCard").mouseover(function(){
+            onUserCard = true;
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
+            onUserCard = false;
             $(this).css("display","none");
         })
         $(".coursesLineGrey").mouseover(function(){
diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index 7e0832257..846522050 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -1,5 +1,7 @@
 <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <script>
+    var onUserCard = false;
+    var onImage = false;
     $(document).ready(function(){
         $("#relateProject,.relatePInfo").mouseover(function(){
             $(".relatePInfo").css("display","block");
@@ -8,15 +10,24 @@
             $(".relatePInfo").css("display","none");
         })
         $(".homepagePostPortrait").mouseover(function(){
+            onImage = true;
             $(this).children(".userCard").css("display","block");
         })
         $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
+            var cur = $(this);
+            onImage = false;
+            setTimeout(function(){
+                if (onUserCard == false && onImage == false) {
+                    $(cur).children(".userCard").css("display", "none");
+                }
+            }, 500);
         })
         $(".userCard").mouseover(function(){
+            onUserCard = true;
             $(this).css("display","block");
         })
         $(".userCard").mouseout(function(){
+            onUserCard = false;
             $(this).css("display","none");
         })
         $(".coursesLineGrey").mouseover(function(){
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 01711ace3..eb73f9226 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -9,19 +9,6 @@
         $("#relateProject,.relatePInfo").mouseout(function(){
             $(".relatePInfo").css("display","none");
         })
-        $(".homepagePostPortrait").mouseover(function(){
-            $(this).children(".userCard").css("display","block");
-        })
-        $(".homepagePostPortrait").mouseout(function(){
-            $(this).children(".userCard").css("display","none");
-        })
-        $(".userCard").mouseover(function(){
-
-            $(this).css("display","block");
-        })
-        $(".userCard").mouseout(function(){
-            $(this).css("display","none");
-        })
         $(".coursesLineGrey").mouseover(function(){
             $(this).css("color","#ffffff");
         })