From 798e68509b3a3bed0c53680dc7945b1b65b814f2 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sun, 2 Aug 2015 18:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20js=20=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=92=8C=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin.js                 |  1 -
 static/src/js/app/admin/contest/contest.js |  2 +-
 static/src/js/app/oj.js                    |  1 -
 static/src/js/build.js                     | 17 ++++++++++++-----
 static/src/js/config.js                    |  3 ---
 template/admin/contest/add_contest.html    |  4 +++-
 template/admin_base.html                   |  6 +++++-
 template/oj/account/login.html             |  2 +-
 8 files changed, 22 insertions(+), 14 deletions(-)
 delete mode 100644 static/src/js/app/admin.js
 delete mode 100644 static/src/js/app/oj.js

diff --git a/static/src/js/app/admin.js b/static/src/js/app/admin.js
deleted file mode 100644
index 29a31b7..0000000
--- a/static/src/js/app/admin.js
+++ /dev/null
@@ -1 +0,0 @@
-require(["bootstrap", "contest"]);
\ No newline at end of file
diff --git a/static/src/js/app/admin/contest/contest.js b/static/src/js/app/admin/contest/contest.js
index 75ba185..bc13d9d 100644
--- a/static/src/js/app/admin/contest/contest.js
+++ b/static/src/js/app/admin/contest/contest.js
@@ -1,4 +1,4 @@
-define("contest", ["jquery", "avalon", "editor", "uploader", "datetimepicker",
+require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
         "validation"
     ],
     function ($, avalon, editor, uploader) {
diff --git a/static/src/js/app/oj.js b/static/src/js/app/oj.js
deleted file mode 100644
index c3162bf..0000000
--- a/static/src/js/app/oj.js
+++ /dev/null
@@ -1 +0,0 @@
-require(["bootstrap", "login", "submit_code"]);
diff --git a/static/src/js/build.js b/static/src/js/build.js
index ccff2a0..36bccda 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -6,18 +6,16 @@
         //百度webuploader
         webuploader: "lib/webuploader/webuploader",
 
-        jquery: "lib/jquery/jquery",
+        jquery: "empty:",
         avalon: "lib/avalon/avalon",
         editor: "utils/editor",
         uploader: "utils/uploader",
         validation: "utils/validation",
         code_mirror: "utils/code_mirror",
         login: "app/oj/account/login",
-        oj: "app/oj",
         "bs_alert": "utils/bs_alert",
         submit_code: "app/oj/problem/submit_code",
         contest: "app/admin/contest/contest",
-        admin: "app/admin",
 
         //formValidation 不要在代码中单独使用，而是使用和修改utils/validation
         base: "lib/formValidation/base",
@@ -58,10 +56,19 @@
     dir: "../../release/",
     modules: [
         {
-            name: "login"
+            name: "submit_code"
         },
         {
-            name: "admin"
+            name: "validation"
+        },
+        {
+            name: "editor"
+        },
+        {
+            name: "code_mirror"
+        },
+        {
+            name: "datetimepicker"
         }
     ]
 })
\ No newline at end of file
diff --git a/static/src/js/config.js b/static/src/js/config.js
index c753229..dc17a5a 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -11,11 +11,9 @@ var require = {
         uploader: "utils/uploader",
         validation: "utils/validation",
         code_mirror: "utils/code_mirror",
-        oj: "app/oj/oj",
         bs_alert: "utils/bs_alert",
         submit_code: "app/oj/problem/submit_code",
         contest: "app/admin/contest/contest",
-        admin: "app/admin",
 
         //formValidation 不要在代码中单独使用，而是使用和修改utils/validation
         base: "lib/formValidation/base",
@@ -44,7 +42,6 @@ var require = {
         //
         "_datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker",
         "datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker.zh-CN"
-
     },
     shim: {
         "bootstrap": {"deps": ['jquery']},
diff --git a/template/admin/contest/add_contest.html b/template/admin/contest/add_contest.html
index 47bc2d3..d3fa165 100644
--- a/template/admin/contest/add_contest.html
+++ b/template/admin/contest/add_contest.html
@@ -175,9 +175,11 @@
                         </div>
                     </div>
                 </div>
-
             </div>
         </form>
     </div>
     {% endverbatim %}
+{% endblock %}
+{% block js_block %}
+    <script src="/static/js/app/admin/contest/contest.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/template/admin_base.html b/template/admin_base.html
index 2f404d8..8525b2e 100644
--- a/template/admin_base.html
+++ b/template/admin_base.html
@@ -106,7 +106,11 @@
 </div>
 
 <script src="/static/js/config.js"></script>
-<script src="/static/js/require.js" data-main="/static/js/app/admin.js"></script>
+<script src="/static/js/require.js"></script>
+<script>
+    require(["bootstrap"]);
+</script>
+{% block js_block %}{% endblock %}
 <!-- footer begin -->
 <div class="footer">
     <p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>
diff --git a/template/oj/account/login.html b/template/oj/account/login.html
index 74b8a22..e9ddbf2 100644
--- a/template/oj/account/login.html
+++ b/template/oj/account/login.html
@@ -22,5 +22,5 @@
 </div>
 {% endblock %}
 {% block js_block %}
-<script src="/static/js/require.js" data-main="/static/js/app/oj/account/login.js"></script>
+<script src="/static/js/app/oj/account/login.js"></script>
 {% endblock %}
\ No newline at end of file