为了方便合并 js,调整 require.js 的 配置引入位置。

This commit is contained in:
virusdefender 2015-08-01 22:53:01 +08:00
parent eea0a7fbde
commit 27fda78bf2
4 changed files with 22 additions and 12 deletions

View File

@ -1,4 +1,3 @@
require(["../config"], function(){
require(["bootstrap", "login"])
});
require(["bootstrap", "login"]);

View File

@ -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
})

View File

@ -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']}
}
});
};

View File

@ -94,7 +94,8 @@
</div>
<!-- custom body end -->
<script src="/static/js/require.js" data-main="/static/js/app/oj.js"></script>
<script src="/static/js/config.js"></script>
<script src="/static/js/require.js" data-main="/static/js/oj-build.js"></script>
<!-- footer begin -->
<div class="footer">
<p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>