From 163ae0ae53a7c744bf1a6deb86e194e2e74b270f Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Thu, 8 Oct 2015 11:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=80=92=E8=AE=A1=E6=97=B6?=
=?UTF-8?q?=20js=20=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/src/js/build.js | 78 ++++++++++---------
static/src/js/config.js | 37 ++++-----
template/src/oj/contest/contest_index.html | 2 +-
.../src/oj/contest/no_contest_permission.html | 2 +-
4 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/static/src/js/build.js b/static/src/js/build.js
index 6baa25c..d135481 100644
--- a/static/src/js/build.js
+++ b/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",
- addContest_1_pack: "app/admin/contest/addContest",
- problem_2_pack: "app/admin/problem/problem",
- register_3_pack: "app/oj/account/register",
- contestList_4_pack: "app/admin/contest/contestList",
- group_5_pack: "app/oj/group/group",
- editProblem_6_pack: "app/admin/problem/editProblem",
- announcement_7_pack: "app/admin/announcement/announcement",
- monitor_8_pack: "app/admin/monitor/monitor",
- groupDetail_9_pack: "app/admin/group/groupDetail",
- admin_10_pack: "app/admin/admin",
- problem_11_pack: "app/oj/problem/problem",
- submissionList_12_pack: "app/admin/problem/submissionList",
+ announcement_0_pack: "app/admin/announcement/announcement",
+ userList_1_pack: "app/admin/user/userList",
+ problem_2_pack: "app/oj/problem/problem",
+ submissionList_3_pack: "app/admin/problem/submissionList",
+ contestCountdown_4_pack: "app/oj/contest/contestCountdown",
+ addProblem_5_pack: "app/admin/problem/addProblem",
+ problem_6_pack: "app/admin/problem/problem",
+ contestList_7_pack: "app/admin/contest/contestList",
+ admin_8_pack: "app/admin/admin",
+ login_9_pack: "app/oj/account/login",
+ addContest_10_pack: "app/admin/contest/addContest",
+ changePassword_11_pack: "app/oj/account/changePassword",
+ 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_16_pack: "app/admin/group/group",
- submissionList_17_pack: "app/admin/contest/submissionList",
- login_18_pack: "app/oj/account/login",
+ group_15_pack: "app/oj/group/group",
+ editProblem_16_pack: "app/admin/problem/editProblem",
+ register_17_pack: "app/oj/account/register",
+ 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: "addContest_1_pack"
+ name: "userList_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",
diff --git a/static/src/js/config.js b/static/src/js/config.js
index eeae134..c543f5f 100644
--- a/static/src/js/config.js
+++ b/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",
- addContest_1_pack: "app/admin/contest/addContest",
- problem_2_pack: "app/admin/problem/problem",
- register_3_pack: "app/oj/account/register",
- contestList_4_pack: "app/admin/contest/contestList",
- group_5_pack: "app/oj/group/group",
- editProblem_6_pack: "app/admin/problem/editProblem",
- announcement_7_pack: "app/admin/announcement/announcement",
- monitor_8_pack: "app/admin/monitor/monitor",
- groupDetail_9_pack: "app/admin/group/groupDetail",
- admin_10_pack: "app/admin/admin",
- problem_11_pack: "app/oj/problem/problem",
- submissionList_12_pack: "app/admin/problem/submissionList",
+ announcement_0_pack: "app/admin/announcement/announcement",
+ userList_1_pack: "app/admin/user/userList",
+ problem_2_pack: "app/oj/problem/problem",
+ submissionList_3_pack: "app/admin/problem/submissionList",
+ contestCountdown_4_pack: "app/oj/contest/contestCountdown",
+ addProblem_5_pack: "app/admin/problem/addProblem",
+ problem_6_pack: "app/admin/problem/problem",
+ contestList_7_pack: "app/admin/contest/contestList",
+ admin_8_pack: "app/admin/admin",
+ login_9_pack: "app/oj/account/login",
+ addContest_10_pack: "app/admin/contest/addContest",
+ changePassword_11_pack: "app/oj/account/changePassword",
+ 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_16_pack: "app/admin/group/group",
- submissionList_17_pack: "app/admin/contest/submissionList",
- login_18_pack: "app/oj/account/login",
+ group_15_pack: "app/oj/group/group",
+ editProblem_16_pack: "app/admin/problem/editProblem",
+ register_17_pack: "app/oj/account/register",
+ 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"
}
};
\ No newline at end of file
diff --git a/template/src/oj/contest/contest_index.html b/template/src/oj/contest/contest_index.html
index 0c98523..786a21e 100644
--- a/template/src/oj/contest/contest_index.html
+++ b/template/src/oj/contest/contest_index.html
@@ -41,5 +41,5 @@
%s : %ts
-
+
{% endblock %}
diff --git a/template/src/oj/contest/no_contest_permission.html b/template/src/oj/contest/no_contest_permission.html
index f741889..f99d60c 100644
--- a/template/src/oj/contest/no_contest_permission.html
+++ b/template/src/oj/contest/no_contest_permission.html
@@ -59,5 +59,5 @@
-
+
{% endblock %}
\ No newline at end of file