Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13733 from edx/yro_localized-datetime

Browse Source 
Set up DateUtil factory, modify requests to handle moment-timezones, moment-with-locales.
This commit is contained in:
Gregory Martin
2016-10-17 10:10:59 -04:00
committed by GitHub
parent 252880e5de 4ddda443b8
commit 2f868e5e24
19 changed files with 12915 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/static/cms/js/require-config.js
View File

@@ -50,8 +50,8 @@
'jquery.immediateDescendents': 'coffee/src/jquery.immediateDescendents',
'datepair': 'js/vendor/timepicker/datepair',
'date': 'js/vendor/date',
'moment': 'js/vendor/moment.min',
'moment-with-locales': 'js/vendor/moment-with-locales.min',
moment: 'common/js/vendor/moment-with-locales',
'moment-timezone': 'common/js/vendor/moment-timezone-with-data',
'text': 'js/vendor/requirejs/text',
'underscore': 'common/js/vendor/underscore',
'underscore.string': 'common/js/vendor/underscore.string',

3
cms/static/cms/js/spec/main.js
View File

@@ -32,8 +32,7 @@
'jquery.simulate': 'xmodule_js/common_static/js/vendor/jquery.simulate',
'datepair': 'xmodule_js/common_static/js/vendor/timepicker/datepair',
'date': 'xmodule_js/common_static/js/vendor/date',
'moment': 'xmodule_js/common_static/js/vendor/moment.min',
'moment-with-locales': 'xmodule_js/common_static/js/vendor/moment-with-locales.min',
moment: 'common/js/vendor/moment-with-locales',
'text': 'xmodule_js/common_static/js/vendor/requirejs/text',
'underscore': 'common/js/vendor/underscore',
'underscore.string': 'common/js/vendor/underscore.string',