From 27fda78bf2154c7061d9c07683c87604523030be Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sat, 1 Aug 2015 22:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=96=B9=E4=BE=BF=E5=90=88?=
=?UTF-8?q?=E5=B9=B6=20js=EF=BC=8C=E8=B0=83=E6=95=B4=20require.js=20?=
=?UTF-8?q?=E7=9A=84=20=E9=85=8D=E7=BD=AE=E5=BC=95=E5=85=A5=E4=BD=8D?=
=?UTF-8?q?=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/src/js/app/oj.js | 5 ++---
static/src/js/build.js | 22 ++++++++++++++++------
static/src/js/config.js | 4 ++--
template/oj_base.html | 3 ++-
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/static/src/js/app/oj.js b/static/src/js/app/oj.js
index e23fc96f..03c344b5 100644
--- a/static/src/js/app/oj.js
+++ b/static/src/js/app/oj.js
@@ -1,4 +1,3 @@
-require(["../config"], function(){
- require(["bootstrap", "login"])
-});
\ No newline at end of file
+
+require(["bootstrap", "login"]);
diff --git a/static/src/js/build.js b/static/src/js/build.js
index f2d06b16..128e22e8 100644
--- a/static/src/js/build.js
+++ b/static/src/js/build.js
@@ -1,18 +1,21 @@
({
// RequireJS 通过一个相对的路径 baseUrl来加载所有代码。baseUrl通常被设置成data-main属性指定脚本的同级目录。
baseUrl: ".",
- //dir: '../built',
// 第三方脚本模块的别名,jquery比libs/jquery-1.11.1.min.js简洁明了；
paths: {
//百度webuploader
webuploader: "lib/webuploader/webuploader",
- jquery: "empty:",
+ jquery: "lib/jquery/jquery",
avalon: "lib/avalon/avalon",
editor: "utils/editor",
uploader: "utils/uploader",
validation: "utils/validation",
code_mirror: "utils/code_mirror",
+ login: "app/account/login",
+ oj: "app/oj",
+ "bs_alert": "utils/bs_alert",
+
//formValidation 不要在代码中单独使用，而是使用和修改utils/validation
base: "lib/formValidation/base",
@@ -25,7 +28,7 @@
"validator/integer": "lib/formValidation/validator/integer",
"validator/between": "lib/formValidation/validator/between",
- //富文本编辑器
+ //富文本编辑器 不要直接使用，而是使用上面的editor
simditor: "lib/simditor/simditor",
"simple-module": "lib/simditor/module",
"simple-hotkeys": "lib/simditor/hotkeys",
@@ -33,10 +36,17 @@
//code mirroe 代码编辑器
_code_mirror: "lib/codeMirror/codemirror",
- code_mirror_clang: "lib/codeMirror/language/clike"
+ code_mirror_clang: "lib/codeMirror/language/clike",
+
+ //bootstrap
+ bootstrap: "lib/bootstrap/bootstrap"
+
},
- modules: [{name: "app/main1"}],
- dir: "app",
+ shim: {
+ "bootstrap": {"deps": ['jquery']}
+ },
+ name: "oj",
+ out: "oj-build.js",
findNestedDependencies: true
//wrapShim: true
})
\ No newline at end of file
diff --git a/static/src/js/config.js b/static/src/js/config.js
index c5a7379e..a612ddd5 100644
--- a/static/src/js/config.js
+++ b/static/src/js/config.js
@@ -1,4 +1,4 @@
-require.config({
+var require = {
// RequireJS 通过一个相对的路径 baseUrl来加载所有代码。baseUrl通常被设置成data-main属性指定脚本的同级目录。
baseUrl: "/static/js/",
paths: {
@@ -44,4 +44,4 @@ require.config({
shim: {
"bootstrap": {"deps": ['jquery']}
}
-});
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/template/oj_base.html b/template/oj_base.html
index 49b47266..05ca7a6c 100644
--- a/template/oj_base.html
+++ b/template/oj_base.html
@@ -94,7 +94,8 @@
-
+
+