Commit 637bf014 authored by xishifeng's avatar xishifeng

2

parent 135d50a7
require.config ({
require.config({
'baseUrl': (location.origin || location.protocol + '//' + location.hostname + (location.port == 80 ? '' : ':' + location.port)) + '/resource',
'waitSeconds': 0,
......@@ -15,13 +15,13 @@ require.config ({
'ckfinder': 'lib/Ckfinder/ckfinder',
'ckfinderStart': 'lib/js/ckfinderStart',
'bootstrapJs': 'lib/js/bootstrap.min',
// 'datetimepicker': 'lib/js/bootstrap-datetimepicker.min',
// 'datetimepicker': 'lib/js/bootstrap-datetimepicker.min',
'datetimepicker': 'lib/js/bootstrap-datetimepicker',
'pagination': 'lib/js/Pagination',
'paginationStart': 'lib/js/zw.pagination',
'checkLogin': 'lib/js/checkLoginFailureAjax',
'blow-up': 'lib/js/blow-up',
'97datePicker' : 'lib/js/my97datePicker/WdatePicker',
'97datePicker': 'lib/js/my97datePicker/WdatePicker',
'photo-gallery': 'lib/js/jquery-photo-gallery/jquery.photo.gallery',
},
......@@ -45,14 +45,14 @@ require.config ({
'datetimepicker': {
'exports': 'datetimepicker'
},
'pagination' : {
'pagination': {
'deps': ['jquery'],
'exports': 'Pagination'
},
'paginationStart':{
'paginationStart': {
'exports': 'pagination'
},
'blow-up' : {
'blow-up': {
'deps': ['jquery'],
'exports': 'blow-up'
},
......@@ -64,10 +64,10 @@ require.config ({
'deps': ['jquery'],
'exports': 'validate'
},
'97datePicker':{
'deps':['jquery'],
'97datePicker': {
'deps': ['jquery'],
'exports': '97datePicker'
}
},
'photo-gallery': {
'deps': ['jquery'],
'exports': 'photo-gallery'
......@@ -83,4 +83,4 @@ require.config ({
}
});
require (['require', 'jquery', 'doT','layer', "datetimepicker",'bootstrapJs','pagination','paginationStart','checkLogin','photo-gallery','97datePicker','app/public']);
require(['require', 'jquery', 'doT', 'layer', "datetimepicker", 'bootstrapJs', 'pagination', 'paginationStart', 'checkLogin', 'photo-gallery', '97datePicker', 'app/public']);
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment