Skip to content

T
tl_estate
Commit 135d50a7 authored by xishifeng's avatar xishifeng
Browse files
Options

1

parent ec25b440
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
public/resource/js/main.js
View file @ 135d50a7
...@@ -21,7 +21,9 @@ require.config ({ ...@@ -21,7 +21,9 @@ require.config ({
'paginationStart': 'lib/js/zw.pagination', 'paginationStart': 'lib/js/zw.pagination',
'checkLogin': 'lib/js/checkLoginFailureAjax', 'checkLogin': 'lib/js/checkLoginFailureAjax',
'blow-up': 'lib/js/blow-up', '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',
}, },
'shim': { 'shim': {
'jquery': { 'jquery': {
...@@ -62,10 +64,14 @@ require.config ({ ...@@ -62,10 +64,14 @@ require.config ({
'deps': ['jquery'], 'deps': ['jquery'],
'exports': 'validate' 'exports': 'validate'
}, },
'97datePicker':{ '97datePicker':{
'deps':['jquery'], 'deps':['jquery'],
'exports': '97datePicker' 'exports': '97datePicker'
} }
'photo-gallery': {
'deps': ['jquery'],
'exports': 'photo-gallery'
}
}, },
'map': { 'map': {
...@@ -77,4 +83,4 @@ require.config ({ ...@@ -77,4 +83,4 @@ require.config ({
} }
}); });
require (['require', 'jquery', 'doT','layer', 'app/public' ,"datetimepicker",'bootstrapJs','pagination','paginationStart','checkLogin','97datePicker']); require (['require', 'jquery', 'doT','layer', "datetimepicker",'bootstrapJs','pagination','paginationStart','checkLogin','photo-gallery','97datePicker','app/public']);
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