压缩 bootstrap js

This commit is contained in:
virusdefender 2015-12-23 15:10:46 +08:00
parent fe2c524ea3
commit 9d6aa30c89
4 changed files with 13 additions and 18 deletions

View File

@ -51,6 +51,7 @@
//"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
//以下都是页面 script 标签引用的js
//以下都是页面 script 标签引用的js
announcement_0_pack: "app/admin/announcement/announcement",
userList_1_pack: "app/admin/user/userList",
@ -68,6 +69,7 @@
addContest_13_pack: "app/admin/contest/addContest",
contestPassword_14_pack: "app/oj/contest/contestPassword",
changePassword_15_pack: "app/oj/account/changePassword",
judges_16_pack: "app/admin/judges/judges",
editProblem_17_pack: "app/admin/contest/editProblem",
joinGroupRequestList_18_pack: "app/admin/group/joinGroupRequestList",
group_19_pack: "app/oj/group/group",
@ -89,6 +91,11 @@
appDir: "../",
dir: "../../release/",
modules: [
// 提交脚本提取的模块的时候不要删掉这个
{
name: "bootstrap",
},
/////////////////////////////////
{
name: "announcement_0_pack"
},
@ -137,6 +144,9 @@
{
name: "changePassword_15_pack"
},
{
name: "judges_16_pack"
},
{
name: "editProblem_17_pack"
},

View File

@ -53,6 +53,7 @@ var require = {
// "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
//以下都是页面 script 标签引用的js
//以下都是页面 script 标签引用的js
announcement_0_pack: "app/admin/announcement/announcement",
userList_1_pack: "app/admin/user/userList",
@ -70,6 +71,7 @@ var require = {
addContest_13_pack: "app/admin/contest/addContest",
contestPassword_14_pack: "app/oj/contest/contestPassword",
changePassword_15_pack: "app/oj/account/changePassword",
judges_16_pack: "app/admin/judges/judges",
editProblem_17_pack: "app/admin/contest/editProblem",
joinGroupRequestList_18_pack: "app/admin/group/joinGroupRequestList",
group_19_pack: "app/oj/group/group",

View File

@ -1,15 +0,0 @@
<div class="col-md-9">
<h1>服务器监控</h1>
<div>
<div>
<h3>等待判题队列长度</h3>
<div id="waiting-queue">
<canvas class="line-chart" id="waiting-queue-chart"></canvas>
</div>
</div>
</div>
<button class="btn btn-danger" id="clear-chart-data">清空图表数据</button>
<script src="/static/js/app/admin/monitor/monitor.js"></script>
</div>

View File

@ -91,9 +91,7 @@
<script src="/static/js/config.js"></script>
<script src="/static/js/require.js"></script>
<script>
require(["bootstrap"]);
</script>
<script src="/static/js/lib/bootstrap/bootstrap.js"></script>
{% block js_block %}{% endblock %}
<!-- footer begin -->
<div class="footer">