From 17a317a87cbc49e321fd052a1757f570ceb2bba4 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 10 Jul 2015 15:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=BC=B9?=
=?UTF-8?q?=E5=87=BA=E6=A1=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/courses/join_private_courses.js.erb | 3 ++-
app/views/my/clear_user_avatar_temp.js.erb | 2 +-
app/views/projects/join_project.js.erb | 3 ++-
app/views/users/show_new_score.js.erb | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb
index fecfb13cd..d1bce7d86 100644
--- a/app/views/courses/join_private_courses.js.erb
+++ b/app/views/courses/join_private_courses.js.erb
@@ -1,7 +1,8 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
showModal('ajax-modal', '540px');
$('#ajax-modal').css('height','330px');
-$('#ajax-modal').siblings().remove();
+//$('#ajax-modal').siblings().remove();
+$('#ajax-modal').siblings().hide();
$('#ajax-modal').before("" +
"
");
$('#ajax-modal').parent().removeClass("alert_praise");
diff --git a/app/views/my/clear_user_avatar_temp.js.erb b/app/views/my/clear_user_avatar_temp.js.erb
index 39ff71f6c..9513bdac4 100644
--- a/app/views/my/clear_user_avatar_temp.js.erb
+++ b/app/views/my/clear_user_avatar_temp.js.erb
@@ -1,7 +1,7 @@
$("img[nhname='avatar_image']").attr('src',$("#nh_user_tx").attr('src'));
$('#ajax-modal').html($("#nh_tx_dialog_html").html());
showModal('ajax-modal','460px');
- $('#ajax-modal').siblings().remove();
+ $('#ajax-modal').siblings().hide();
$('#ajax-modal').parent().removeClass("alert_praise");
//$('#ajax-modal').parent().css("top","").css("left","");
$('#ajax-modal').parent().addClass("alert_box");
\ No newline at end of file
diff --git a/app/views/projects/join_project.js.erb b/app/views/projects/join_project.js.erb
index 85e9e294b..92cdfcf2c 100644
--- a/app/views/projects/join_project.js.erb
+++ b/app/views/projects/join_project.js.erb
@@ -1,7 +1,8 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/join_project') %>');
showModal('ajax-modal', '540px');
$('#ajax-modal').css('height','260px');
-$('#ajax-modal').siblings().remove();
+//$('#ajax-modal').siblings().remove();
+$('#ajax-modal').siblings().hide();
$('#ajax-modal').before("" +
"
");
$('#ajax-modal').parent().removeClass("alert_praise");
diff --git a/app/views/users/show_new_score.js.erb b/app/views/users/show_new_score.js.erb
index 4baee5c04..40ef7d5c5 100644
--- a/app/views/users/show_new_score.js.erb
+++ b/app/views/users/show_new_score.js.erb
@@ -1,3 +1,4 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_new_score') %>');
showModal('ajax-modal', '400px');
+$('#ajax-modal').siblings().show();
$('#ajax-modal').addClass('new-watcher');