Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Update moment.js to 2.18.1

Browse Source
This commit is contained in:
JC Brand 2017-04-06 21:55:52 +02:00
parent 362c824368
commit 47a9566bb2
4 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
3rdparty/moment_locales.js vendored
View File

@ -9,22 +9,23 @@
(function (root, factory) { (function (root, factory) {
define("moment_with_locales", [ define("moment_with_locales", [
'moment', // Everything below can be removed except for moment itself. 'moment', // Everything below can be removed except for moment itself.
'moment_af', 'moment/locale/af',
'moment_de', 'moment/locale/de',
'moment_es', 'moment/locale/es',
'moment_fr', 'moment/locale/fr',
'moment_he', 'moment/locale/he',
'moment_hu', 'moment/locale/hu',
'moment_id', 'moment/locale/id',
'moment_it', 'moment/locale/it',
'moment_ja', 'moment/locale/ja',
'moment_nb', 'moment/locale/nb',
'moment_nl', 'moment/locale/nl',
'moment_pl', 'moment/locale/pl',
'moment_pt-br', 'moment/locale/pt-br',
'moment_ru', 'moment/locale/ru',
'moment_uk', 'moment/locale/uk',
'moment_zh' // 'moment/locale/zh' (No longer in locales, now only with
// country codes, e.g. zh-cn.js zh-hk.js zh-tw.js).
], function (moment) { ], function (moment) {
return moment; return moment;
}); });

1
docs/CHANGES.md
View File

@ -3,6 +3,7 @@
## 3.0.2 (Unreleased) ## 3.0.2 (Unreleased)
- Update Jasmine from 1.3.1 to 2.5.3 and Phantomjs from 1.9.7-1 to 2.1.14 [jcbrand] - Update Jasmine from 1.3.1 to 2.5.3 and Phantomjs from 1.9.7-1 to 2.1.14 [jcbrand]
- Update moment.js to 2.18.1 [jcbrand]
## 3.0.1 (2017-04-04) ## 3.0.1 (2017-04-04)

2
package.json
View File

@ -58,7 +58,7 @@
"jshint": "^2.9.4", "jshint": "^2.9.4",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"lodash-template-loader": "^2.0.0", "lodash-template-loader": "^2.0.0",
"moment": "~2.13.0", "moment": "~2.18.1",
"npm": "^4.1.1", "npm": "^4.1.1",
"otr": "0.2.16", "otr": "0.2.16",
"phantomjs-prebuilt": "~2.1.14", "phantomjs-prebuilt": "~2.1.14",

25
src/config.js
View File

@ -26,7 +26,6 @@ require.config({
"jquery-private": "src/jquery-private", "jquery-private": "src/jquery-private",
"jquery.browser": "node_modules/jquery.browser/dist/jquery.browser", "jquery.browser": "node_modules/jquery.browser/dist/jquery.browser",
"jquery.easing": "node_modules/jquery-easing/jquery.easing.1.3.umd", // XXX: Only required for https://conversejs.org website "jquery.easing": "node_modules/jquery-easing/jquery.easing.1.3.umd", // XXX: Only required for https://conversejs.org website
"moment": "node_modules/moment/moment",
"pluggable": "node_modules/pluggable.js/dist/pluggable", "pluggable": "node_modules/pluggable.js/dist/pluggable",
"polyfill": "src/polyfill", "polyfill": "src/polyfill",
"sizzle": "node_modules/jquery/sizzle/dist/sizzle", "sizzle": "node_modules/jquery/sizzle/dist/sizzle",
@ -91,22 +90,6 @@ require.config({
"zh": "locale/zh/LC_MESSAGES/converse.json", "zh": "locale/zh/LC_MESSAGES/converse.json",
"moment_with_locales": "3rdparty/moment_locales", "moment_with_locales": "3rdparty/moment_locales",
'moment_af': "node_modules/moment/locale/af",
'moment_de': "node_modules/moment/locale/de",
'moment_es': "node_modules/moment/locale/es",
'moment_fr': "node_modules/moment/locale/fr",
'moment_he': "node_modules/moment/locale/he",
'moment_hu': "node_modules/moment/locale/hu",
'moment_id': "node_modules/moment/locale/id",
'moment_it': "node_modules/moment/locale/it",
'moment_ja': "node_modules/moment/locale/ja",
'moment_nb': "node_modules/moment/locale/nb",
'moment_nl': "node_modules/moment/locale/nl",
'moment_pl': "node_modules/moment/locale/pl",
'moment_pt-br': "node_modules/moment/locale/pt-br",
'moment_ru': "node_modules/moment/locale/ru",
'moment_uk': "node_modules/moment/locale/uk",
'moment_zh': "node_modules/moment/locale/zh-cn",
// Templates // Templates
"action": "src/templates/action", "action": "src/templates/action",
@ -174,6 +157,14 @@ require.config({
"trimmed_chat": "src/templates/trimmed_chat" "trimmed_chat": "src/templates/trimmed_chat"
}, },
packages: [{
name: 'moment',
// This location is relative to baseUrl. Choose bower_components
// or node_modules, depending on how moment was installed.
location: 'node_modules/moment',
main: 'moment'
}],
map: { map: {
// '*' means all modules will get 'jquery-private' // '*' means all modules will get 'jquery-private'
// for their 'jquery' dependency. // for their 'jquery' dependency.