From 93fb4441d83a54c6378770c395023f8b60419598 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 17 May 2016 14:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B5=8B=E8=AF=95=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=9A=84=E6=8F=90=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/homework.js | 50 ++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index b1144ebf1..a4b30384a 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -11,11 +11,17 @@ $(function(){
         var title = $('#program-title').val();
 
         if (!src) {
-            alert('请输入正确的代码');
+//            alert('请输入正确的代码');
+
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>请输入正确的代码!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
+
             return false;
         }
         if (!title) {
-            alert('请输入标题');
+//            alert('请输入标题');
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>请输入标题!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
             return false;
         }
         return true;
@@ -78,8 +84,8 @@ $(function(){
                         return;
                     }
                     else if (data.status==-3){
-                        alert("对不起,服务器繁忙请稍后再试!");
-                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div>";
+//                        alert("对不起,服务器繁忙请稍后再试!");
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                         $('#test-program-btn').show();
                         return;
@@ -99,10 +105,8 @@ $(function(){
 
                     if (data.status==0 && is_test != 'true') {
                         if (typeof cb == 'function') {cb(data);$('#test-program-btn').show(); return;}
-                        var r=confirm("答题正确，是否立刻提交?");
-                        if (r) {
-                            $(".HomeWorkCon form").submit();
-                        }
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>答题正确，是否立刻提交?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='submit_code()'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div><script>function submit_code(){$('.HomeWorkCon form').submit();hideModal();}</script>";
+                        pop_up_box(htmlvalue,580,30,50);
                         $('#test-program-btn').show();
                         return;
                     }
@@ -119,11 +123,11 @@ $(function(){
             ).fail(function(xhr, status){
                     if(status == 'timeout'){
 //                        alert("您的答案超时了, 请检查代码是否存在死循环的错误.");
-                        var htmlvalue = "</br><div style='width:550px;text-align:center'>您的答案超时了, 请检查代码是否存在死循环的错误!</div>";
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>您的答案超时了, 请检查代码是否存在死循环的错误!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                     } else {
 //                        alert("对不起,服务器繁忙请稍后再试!");
-                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div>";
+                        var htmlvalue = "</br><div style='width:550px;text-align:center'>对不起,服务器繁忙请稍后再试!</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
                         pop_up_box(htmlvalue,580,30,50);
                     }
                     $('#test-program-btn').show();
@@ -142,20 +146,30 @@ $(function(){
             return;
         }
         if($('.ProResult .ProResultTop').length<=0){
-            var r=confirm("测试后才能提交，是否立刻测试?");
-            if (r) {
+//            var r=confirm("测试后才能提交，是否立刻测试?");
+//            if (r) {
+//                test_program();
+//            }
+
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>测试后才能提交，是否立刻测试?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' id='code-test-button' class='Blue-btn fl'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
+            $("#code-test-button").on('click',function(){
                 test_program();
-            }
+                hideModal();
+            });
             return;
         }
-
         if (!tested) {
             test_program(function(data){
                 if (data.status!=0) {
-                    var r=confirm("测试不通过，是否强制提交?");
-                    if (!r) {
-                        return;
-                    }
+//                    var r=confirm("测试不通过，是否强制提交?");
+//                    if (!r) {
+//                        return;
+//                    }
+                    var htmlvalue = "</br><div style='width:550px;text-align:center'>测试不通过，是否强制提交?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='submit_code()'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div><script>function submit_code(){$('.HomeWorkCon form').submit();hideModal();}</script>";
+                    pop_up_box(htmlvalue,580,30,50);
+                    return;
+
                 };
                 $(".HomeWorkCon form").submit();                
             });