From f6a5ffc6a5e5d9cfb7735665f1ade898b9e9c799 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 22 Apr 2016 14:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E7=82=B9=E5=87=BB=E4=B8=80=E4=B8=8B=E7=84=B6?=
 =?UTF-8?q?=E5=90=8E=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1=E7=AD=89=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E8=BF=94=E5=9B=9E=E6=89=8D=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/new_user_commit_homework.html.erb | 2 +-
 public/javascripts/homework.js                    | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index e84b7a95e..4d2a091eb 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -107,7 +107,7 @@
             <div class="mt10">
               <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
               <% if @is_test %>
-                <%=link_to '返  回',homework_common_index_path(:course => @course.id),:class=>'fr mt6' %>
+                <%=link_to '返  回',homework_common_index_path(:course => @course.id),:class=>'fr mt6',:style =>'line-height:30px;' %>
               <% else @is_test %>
                 <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
               <% end %>
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 7aed347b0..391774f0b 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -22,6 +22,7 @@ $(function(){
     };
 
     var test_program = function(cb){
+        $('#test-program-btn').hide();
         var homework_id = $('#test-program-btn').attr('data-homework-id');
         var student_work_id = $('#test-program-btn').attr('data-student-work-id');
         var src = $('#program-src').val();
@@ -29,6 +30,7 @@ $(function(){
         var is_test =  $('input[name=is_test]').val();
 
         if(!valid_form()){
+            $('#test-program-btn').show();
             return;
         }
         /*
@@ -78,17 +80,19 @@ $(function(){
                     $('.ProResult').prepend(html);
 
                     if (data.status==0 && is_test != 'true') {
-                        if (typeof cb == 'function') {cb(data); return;}
+                        if (typeof cb == 'function') {cb(data);$('#test-program-btn').show(); return;}
                         var r=confirm("答题正确，是否立刻提交?");
                         if (r) {
                             $(".HomeWorkCon form").submit();
                         }
+                        $('#test-program-btn').show();
                         return;
                     }
 
                     //2 超时 -2 编译错误 测试结束
                     if (data.status == 2 || data.status == -2 || tSeq >= tCount ){
-                        if (typeof cb == 'function') {cb(data); return;}
+                        if (typeof cb == 'function') {cb(data);$('#test-program-btn').show(); return;}
+                        $('#test-program-btn').show();
                         return;
                     }
 
@@ -100,6 +104,7 @@ $(function(){
                     } else {
                         alert("对不起,服务器繁忙请稍后再试!");
                     }
+                    $('#test-program-btn').show();
                     return;
                 });
         };