增加倒计时 js 打包

static/src/js/build.js

@@ -6,6 +6,7 @@
         jquery: "empty:",
         avalon: "empty:",
         editor: "utils/editor",
+        jcountdown: "lib/jcountdown/jcountdown",
         uploader: "utils/uploader",
         formValidation: "utils/formValidation",
         codeMirror: "utils/codeMirror",
@@ -45,73 +46,71 @@
         //"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
 
         //以下都是页面 script 标签引用的js
-        addProblem_0_pack: "app/admin/problem/addProblem",
+        announcement_0_pack: "app/admin/announcement/announcement",
-        addContest_1_pack: "app/admin/contest/addContest",
+        userList_1_pack: "app/admin/user/userList",
-        problem_2_pack: "app/admin/problem/problem",
+        problem_2_pack: "app/oj/problem/problem",
-        register_3_pack: "app/oj/account/register",
+        submissionList_3_pack: "app/admin/problem/submissionList",
-        contestList_4_pack: "app/admin/contest/contestList",
+        contestCountdown_4_pack: "app/oj/contest/contestCountdown",
-        group_5_pack: "app/oj/group/group",
+        addProblem_5_pack: "app/admin/problem/addProblem",
-        editProblem_6_pack: "app/admin/problem/editProblem",
+        problem_6_pack: "app/admin/problem/problem",
-        announcement_7_pack: "app/admin/announcement/announcement",
+        contestList_7_pack: "app/admin/contest/contestList",
-        monitor_8_pack: "app/admin/monitor/monitor",
+        admin_8_pack: "app/admin/admin",
-        groupDetail_9_pack: "app/admin/group/groupDetail",
+        login_9_pack: "app/oj/account/login",
-        admin_10_pack: "app/admin/admin",
+        addContest_10_pack: "app/admin/contest/addContest",
-        problem_11_pack: "app/oj/problem/problem",
+        changePassword_11_pack: "app/oj/account/changePassword",
-        submissionList_12_pack: "app/admin/problem/submissionList",
+        monitor_12_pack: "app/admin/monitor/monitor",
         editProblem_13_pack: "app/admin/contest/editProblem",
         joinGroupRequestList_14_pack: "app/admin/group/joinGroupRequestList",
-        changePassword_15_pack: "app/oj/account/changePassword",
+        group_15_pack: "app/oj/group/group",
-        group_16_pack: "app/admin/group/group",
+        editProblem_16_pack: "app/admin/problem/editProblem",
-        submissionList_17_pack: "app/admin/contest/submissionList",
+        register_17_pack: "app/oj/account/register",
-        login_18_pack: "app/oj/account/login",
+        groupDetail_18_pack: "app/admin/group/groupDetail",
         contestPassword_19_pack: "app/oj/contest/contestPassword",
-        userList_20_pack: "app/admin/user/userList"
+        group_20_pack: "app/admin/group/group",
+        submissionList_21_pack: "app/admin/contest/submissionList"
     },
     findNestedDependencies: true,
     appDir: "../",
     dir: "../../release/",
     modules: [
         {
-            name: "bootstrap",
+            name: "announcement_0_pack"
         },
         {
-            name: "addProblem_0_pack"
+            name: "userList_1_pack"
-        },
-        {
-            name: "addContest_1_pack"
         },
         {
             name: "problem_2_pack"
         },
         {
-            name: "register_3_pack"
+            name: "submissionList_3_pack"
         },
         {
-            name: "contestList_4_pack"
+            name: "contestCountdown_4_pack"
         },
         {
-            name: "group_5_pack"
+            name: "addProblem_5_pack"
         },
         {
-            name: "editProblem_6_pack"
+            name: "problem_6_pack"
         },
         {
-            name: "announcement_7_pack"
+            name: "contestList_7_pack"
         },
         {
-            name: "monitor_8_pack"
+            name: "admin_8_pack"
         },
         {
-            name: "groupDetail_9_pack"
+            name: "login_9_pack"
         },
         {
-            name: "admin_10_pack"
+            name: "addContest_10_pack"
         },
         {
-            name: "problem_11_pack"
+            name: "changePassword_11_pack"
         },
         {
-            name: "submissionList_12_pack"
+            name: "monitor_12_pack"
         },
         {
             name: "editProblem_13_pack"
@@ -120,22 +119,25 @@
             name: "joinGroupRequestList_14_pack"
         },
         {
-            name: "changePassword_15_pack"
+            name: "group_15_pack"
         },
         {
-            name: "group_16_pack"
+            name: "editProblem_16_pack"
         },
         {
-            name: "submissionList_17_pack"
+            name: "register_17_pack"
         },
         {
-            name: "login_18_pack"
+            name: "groupDetail_18_pack"
         },
         {
             name: "contestPassword_19_pack"
         },
         {
-            name: "userList_20_pack"
+            name: "group_20_pack"
+        },
+        {
+            name: "submissionList_21_pack"
         }
     ],
     optimizeCss: "standard",

static/src/js/config.js

@@ -47,26 +47,27 @@ var require = {
         // "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
 
         //以下都是页面 script 标签引用的js
-        addProblem_0_pack: "app/admin/problem/addProblem",
+        announcement_0_pack: "app/admin/announcement/announcement",
-        addContest_1_pack: "app/admin/contest/addContest",
+        userList_1_pack: "app/admin/user/userList",
-        problem_2_pack: "app/admin/problem/problem",
+        problem_2_pack: "app/oj/problem/problem",
-        register_3_pack: "app/oj/account/register",
+        submissionList_3_pack: "app/admin/problem/submissionList",
-        contestList_4_pack: "app/admin/contest/contestList",
+        contestCountdown_4_pack: "app/oj/contest/contestCountdown",
-        group_5_pack: "app/oj/group/group",
+        addProblem_5_pack: "app/admin/problem/addProblem",
-        editProblem_6_pack: "app/admin/problem/editProblem",
+        problem_6_pack: "app/admin/problem/problem",
-        announcement_7_pack: "app/admin/announcement/announcement",
+        contestList_7_pack: "app/admin/contest/contestList",
-        monitor_8_pack: "app/admin/monitor/monitor",
+        admin_8_pack: "app/admin/admin",
-        groupDetail_9_pack: "app/admin/group/groupDetail",
+        login_9_pack: "app/oj/account/login",
-        admin_10_pack: "app/admin/admin",
+        addContest_10_pack: "app/admin/contest/addContest",
-        problem_11_pack: "app/oj/problem/problem",
+        changePassword_11_pack: "app/oj/account/changePassword",
-        submissionList_12_pack: "app/admin/problem/submissionList",
+        monitor_12_pack: "app/admin/monitor/monitor",
         editProblem_13_pack: "app/admin/contest/editProblem",
         joinGroupRequestList_14_pack: "app/admin/group/joinGroupRequestList",
-        changePassword_15_pack: "app/oj/account/changePassword",
+        group_15_pack: "app/oj/group/group",
-        group_16_pack: "app/admin/group/group",
+        editProblem_16_pack: "app/admin/problem/editProblem",
-        submissionList_17_pack: "app/admin/contest/submissionList",
+        register_17_pack: "app/oj/account/register",
-        login_18_pack: "app/oj/account/login",
+        groupDetail_18_pack: "app/admin/group/groupDetail",
         contestPassword_19_pack: "app/oj/contest/contestPassword",
-        userList_20_pack: "app/admin/user/userList"
+        group_20_pack: "app/admin/group/group",
+        submissionList_21_pack: "app/admin/contest/submissionList"
     }
 };

template/src/oj/contest/contest_index.html

@@ -41,5 +41,5 @@
             <span class="time">%s</span> : <span>%ts</span>
         </div>
     </script>
-    <script src="/static/js/app/oj/contest/contestCountdown.js" defer="defer"></script>
+    <script src="/static/js/app/oj/contest/contestCountdown.js"></script>
 {% endblock %}

template/src/oj/contest/no_contest_permission.html

@@ -59,5 +59,5 @@
         </div>
     </script>
     <script src="/static/js/app/oj/contest/contestPassword.js"></script>
-    <script src="/static/js/app/oj/contest/contestCountdown.js" defer="defer"></script>
+    <script src="/static/js/app/oj/contest/contestCountdown.js"></script>
 {% endblock %}