修改 js 路径和引用方式
This commit is contained in:
@@ -1 +0,0 @@
|
|||||||
require(["bootstrap", "contest"]);
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
define("contest", ["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
|
||||||
"validation"
|
"validation"
|
||||||
],
|
],
|
||||||
function ($, avalon, editor, uploader) {
|
function ($, avalon, editor, uploader) {
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
require(["bootstrap", "login", "submit_code"]);
|
|
||||||
@@ -6,18 +6,16 @@
|
|||||||
//百度webuploader
|
//百度webuploader
|
||||||
webuploader: "lib/webuploader/webuploader",
|
webuploader: "lib/webuploader/webuploader",
|
||||||
|
|
||||||
jquery: "lib/jquery/jquery",
|
jquery: "empty:",
|
||||||
avalon: "lib/avalon/avalon",
|
avalon: "lib/avalon/avalon",
|
||||||
editor: "utils/editor",
|
editor: "utils/editor",
|
||||||
uploader: "utils/uploader",
|
uploader: "utils/uploader",
|
||||||
validation: "utils/validation",
|
validation: "utils/validation",
|
||||||
code_mirror: "utils/code_mirror",
|
code_mirror: "utils/code_mirror",
|
||||||
login: "app/oj/account/login",
|
login: "app/oj/account/login",
|
||||||
oj: "app/oj",
|
|
||||||
"bs_alert": "utils/bs_alert",
|
"bs_alert": "utils/bs_alert",
|
||||||
submit_code: "app/oj/problem/submit_code",
|
submit_code: "app/oj/problem/submit_code",
|
||||||
contest: "app/admin/contest/contest",
|
contest: "app/admin/contest/contest",
|
||||||
admin: "app/admin",
|
|
||||||
|
|
||||||
//formValidation 不要在代码中单独使用,而是使用和修改utils/validation
|
//formValidation 不要在代码中单独使用,而是使用和修改utils/validation
|
||||||
base: "lib/formValidation/base",
|
base: "lib/formValidation/base",
|
||||||
@@ -58,10 +56,19 @@
|
|||||||
dir: "../../release/",
|
dir: "../../release/",
|
||||||
modules: [
|
modules: [
|
||||||
{
|
{
|
||||||
name: "login"
|
name: "submit_code"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "admin"
|
name: "validation"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "editor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "code_mirror"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "datetimepicker"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
@@ -11,11 +11,9 @@ var require = {
|
|||||||
uploader: "utils/uploader",
|
uploader: "utils/uploader",
|
||||||
validation: "utils/validation",
|
validation: "utils/validation",
|
||||||
code_mirror: "utils/code_mirror",
|
code_mirror: "utils/code_mirror",
|
||||||
oj: "app/oj/oj",
|
|
||||||
bs_alert: "utils/bs_alert",
|
bs_alert: "utils/bs_alert",
|
||||||
submit_code: "app/oj/problem/submit_code",
|
submit_code: "app/oj/problem/submit_code",
|
||||||
contest: "app/admin/contest/contest",
|
contest: "app/admin/contest/contest",
|
||||||
admin: "app/admin",
|
|
||||||
|
|
||||||
//formValidation 不要在代码中单独使用,而是使用和修改utils/validation
|
//formValidation 不要在代码中单独使用,而是使用和修改utils/validation
|
||||||
base: "lib/formValidation/base",
|
base: "lib/formValidation/base",
|
||||||
@@ -44,7 +42,6 @@ var require = {
|
|||||||
//
|
//
|
||||||
"_datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker",
|
"_datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker",
|
||||||
"datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker.zh-CN"
|
"datetimepicker": "lib/datetime_picker/bootstrap-datetimepicker.zh-CN"
|
||||||
|
|
||||||
},
|
},
|
||||||
shim: {
|
shim: {
|
||||||
"bootstrap": {"deps": ['jquery']},
|
"bootstrap": {"deps": ['jquery']},
|
||||||
|
|||||||
@@ -175,9 +175,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
{% endverbatim %}
|
{% endverbatim %}
|
||||||
|
{% endblock %}
|
||||||
|
{% block js_block %}
|
||||||
|
<script src="/static/js/app/admin/contest/contest.js"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
@@ -106,7 +106,11 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="/static/js/config.js"></script>
|
<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 -->
|
<!-- footer begin -->
|
||||||
<div class="footer">
|
<div class="footer">
|
||||||
<p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>
|
<p class="text-muted text-center">Copyright © 2015 青岛大学信息工程学院 创新实验室</p>
|
||||||
|
|||||||
@@ -22,5 +22,5 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block js_block %}
|
{% 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 %}
|
{% endblock %}
|
||||||
Reference in New Issue
Block a user