修改 datetimepicker 为 AMD 模块

This commit is contained in:
virusdefender
2015-09-14 10:37:48 +08:00
parent e76fc95e44
commit f828faa10d
4 changed files with 69 additions and 101 deletions

View File

@@ -3,7 +3,7 @@
baseUrl: "./js",
// 第三方脚本模块的别名,jquery比libs/jquery-1.11.1.min.js简洁明了
paths: {
jquery: "lib/jquery/jquery",
jquery: "empty:",
avalon: "lib/avalon/avalon",
editor: "utils/editor",
uploader: "utils/uploader",
@@ -18,11 +18,10 @@
tagEditor: "lib/tagEditor/jquery.tag-editor.min",
jqueryUI: "lib/jqueryUI/jquery-ui",
bootstrap: "lib/bootstrap/bootstrap",
datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker.zh-CN",
datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker",
validator: "lib/validator/validator",
ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard",
// ------ 下面写的都不要直接用,而是使用上面的封装版本 ------
//富文本编辑器simditor -> editor
simditor: "lib/simditor/simditor",
@@ -34,10 +33,15 @@
_codeMirror: "lib/codeMirror/codemirror",
codeMirrorClang: "lib/codeMirror/language/clike",
// bootstrap组件
modal: "lib/bootstrap/modal",
dropdown: "lib/bootstrap/dropdown",
transition: "lib/bootstrap/transition",
//百度webuploader -> uploader
webUploader: "lib/webuploader/webuploader",
"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
//"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
//以下都是页面 script 标签引用的js
addProblem_0_pack: "app/admin/problem/addProblem",
@@ -50,86 +54,26 @@
announcement_7_pack: "app/admin/announcement/announcement",
monitor_8_pack: "app/admin/monitor/monitor",
groupDetail_9_pack: "app/admin/group/groupDetail",
problem_10_pack: "app/oj/problem/problem",
submissionList_11_pack: "app/admin/problem/submissionList",
editProblem_12_pack: "app/admin/contest/editProblem",
joinGroupRequestList_13_pack: "app/admin/group/joinGroupRequestList",
changePassword_14_pack: "app/oj/account/changePassword",
group_15_pack: "app/admin/group/group",
submissionList_16_pack: "app/admin/contest/submissionList",
login_17_pack: "app/oj/account/login",
contestPassword_18_pack: "app/oj/contest/contestPassword",
userList_19_pack: "app/admin/user/userList",
},
shim: {
bootstrap: {deps: ["jquery"]},
_datetimePicker: {dep: ["jquery"]},
datetimePicker: {deps: ["_datetimePicker"]},
validator: ["jquery"]
admin_10_pack: "app/admin/admin",
problem_11_pack: "app/oj/problem/problem",
submissionList_12_pack: "app/admin/problem/submissionList",
editProblem_13_pack: "app/admin/contest/editProblem",
joinGroupRequestList_14_pack: "app/admin/group/joinGroupRequestList",
changePassword_15_pack: "app/oj/account/changePassword",
group_16_pack: "app/admin/group/group",
submissionList_17_pack: "app/admin/contest/submissionList",
login_18_pack: "app/oj/account/login",
contestPassword_19_pack: "app/oj/contest/contestPassword",
userList_20_pack: "app/admin/user/userList"
},
findNestedDependencies: true,
appDir: "../",
dir: "../../release/",
modules: [
{
name: "addProblem_0_pack"
},
{
name: "addContest_1_pack"
},
{
name: "problem_2_pack"
},
{
name: "register_3_pack"
},
{
name: "contestList_4_pack"
},
{
name: "group_5_pack"
},
{
name: "editProblem_6_pack"
},
{
name: "announcement_7_pack"
},
{
name: "monitor_8_pack"
},
{
name: "groupDetail_9_pack"
},
{
name: "problem_10_pack"
},
{
name: "submissionList_11_pack"
},
{
name: "editProblem_12_pack"
},
{
name: "joinGroupRequestList_13_pack"
},
{
name: "changePassword_14_pack"
},
{
name: "group_15_pack"
},
{
name: "submissionList_16_pack"
},
{
name: "login_17_pack"
},
{
name: "contestPassword_18_pack"
},
{
name: "userList_19_pack"
}
]
],
optimizeCss: "standard",
})

View File

@@ -17,7 +17,7 @@ var require = {
tagEditor: "lib/tagEditor/jquery.tag-editor.min",
jqueryUI: "lib/jqueryUI/jquery-ui",
bootstrap: "lib/bootstrap/bootstrap",
datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker.zh-CN",
datetimePicker: "lib/datetime_picker/bootstrap-datetimepicker",
validator: "lib/validator/validator",
ZeroClipboard: "lib/ZeroClipboard/ZeroClipboard",
@@ -33,10 +33,15 @@ var require = {
_codeMirror: "lib/codeMirror/codemirror",
codeMirrorClang: "lib/codeMirror/language/clike",
// bootstrap组件
modal: "lib/bootstrap/modal",
dropdown: "lib/bootstrap/dropdown",
transition: "lib/bootstrap/transition",
//百度webuploader -> uploader
webUploader: "lib/webuploader/webuploader",
"_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
// "_datetimePicker": "lib/datetime_picker/bootstrap-datetimepicker",
//以下都是页面 script 标签引用的js
addProblem_0_pack: "app/admin/problem/addProblem",
@@ -49,21 +54,16 @@ var require = {
announcement_7_pack: "app/admin/announcement/announcement",
monitor_8_pack: "app/admin/monitor/monitor",
groupDetail_9_pack: "app/admin/group/groupDetail",
problem_10_pack: "app/oj/problem/problem",
submissionList_11_pack: "app/admin/problem/submissionList",
editProblem_12_pack: "app/admin/contest/editProblem",
joinGroupRequestList_13_pack: "app/admin/group/joinGroupRequestList",
changePassword_14_pack: "app/oj/account/changePassword",
group_15_pack: "app/admin/group/group",
submissionList_16_pack: "app/admin/contest/submissionList",
login_17_pack: "app/oj/account/login",
contestPassword_18_pack: "app/oj/contest/contestPassword",
userList_19_pack: "app/admin/user/userList"
},
shim: {
bootstrap: {deps: ["jquery"]},
_datetimePicker: {dep: ["jquery"]},
datetimePicker: {deps: ["_datetimePicker"]},
validator: ["jquery"]
admin_10_pack: "app/admin/admin",
problem_11_pack: "app/oj/problem/problem",
submissionList_12_pack: "app/admin/problem/submissionList",
editProblem_13_pack: "app/admin/contest/editProblem",
joinGroupRequestList_14_pack: "app/admin/group/joinGroupRequestList",
changePassword_15_pack: "app/oj/account/changePassword",
group_16_pack: "app/admin/group/group",
submissionList_17_pack: "app/admin/contest/submissionList",
login_18_pack: "app/oj/account/login",
contestPassword_19_pack: "app/oj/contest/contestPassword",
userList_20_pack: "app/admin/user/userList"
}
};

View File

@@ -26,8 +26,15 @@
*
* Make it work in bootstrap v3
*/
!function ($) {
(function(factory){
if (typeof define === "function" && define.amd) {
define(["jquery"], factory);
} else if (typeof exports === 'object') {
factory(require('jquery'));
} else {
factory(jQuery);
}
}(function ($, undefined) {
function UTCDate() {
return new Date(Date.UTC.apply(Date, arguments));
@@ -1764,6 +1771,17 @@
'</div>';
$.fn.datetimepicker.DPGlobal = DPGlobal;
$.fn.datetimepicker.dates['zh-CN'] = {
days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
daysMin: ["日", "一", "二", "三", "四", "五", "六", "日"],
months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
today: "今天",
suffix: [],
meridiem: ["上午", "下午"]
};
/* DATETIMEPICKER NO CONFLICT
* =================== */
@@ -1790,4 +1808,4 @@
$('[data-provide="datetimepicker-inline"]').datetimepicker();
});
}(window.jQuery);
}));

View File

@@ -2,7 +2,13 @@
* Simplified Chinese translation for bootstrap-datetimepicker
* Yuan Cheung <advanimal@gmail.com>
*/
;(function($){
!function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery', '_datetimePicker'], factory);
} else {
factory(root.jQuery);
}
}(this, function($){
$.fn.datetimepicker.dates['zh-CN'] = {
days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
@@ -13,4 +19,4 @@
suffix: [],
meridiem: ["上午", "下午"]
};
}(jQuery));
});