Use template loader that works with lodash.
Also update pluggable.js to a version that works with lodash.
This commit is contained in:
parent
081f075aa9
commit
4a6d85661a
12
config.js
12
config.js
@ -23,7 +23,7 @@ require.config({
|
|||||||
"jquery": "node_modules/jquery/dist/jquery",
|
"jquery": "node_modules/jquery/dist/jquery",
|
||||||
"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",
|
"moment": "node_modules/moment/moment",
|
||||||
"pluggable": "node_modules/pluggable.js/pluggable",
|
"pluggable": "node_modules/pluggable.js/pluggable",
|
||||||
"polyfill": "src/polyfill",
|
"polyfill": "src/polyfill",
|
||||||
@ -41,10 +41,9 @@ require.config({
|
|||||||
"strophe.rsm": "node_modules/strophejs-plugins/rsm/strophe.rsm",
|
"strophe.rsm": "node_modules/strophejs-plugins/rsm/strophe.rsm",
|
||||||
"strophe.vcard": "node_modules/strophejs-plugins/vcard/strophe.vcard",
|
"strophe.vcard": "node_modules/strophejs-plugins/vcard/strophe.vcard",
|
||||||
"text": "node_modules/text/text",
|
"text": "node_modules/text/text",
|
||||||
"tpl": "node_modules/requirejs-undertemplate/tpl",
|
"tpl": "node_modules/lodash-template-loader/loader",
|
||||||
"typeahead": "components/typeahead.js/index",
|
"typeahead": "components/typeahead.js/index",
|
||||||
"lodash": "node_modules/lodash/lodash",
|
"lodash": "node_modules/lodash/lodash",
|
||||||
"underscore": "node_modules/underscore/underscore",
|
|
||||||
"utils": "src/utils",
|
"utils": "src/utils",
|
||||||
|
|
||||||
// Converse
|
// Converse
|
||||||
@ -188,14 +187,17 @@ require.config({
|
|||||||
map: {
|
map: {
|
||||||
// '*' means all modules will get 'jquery-private'
|
// '*' means all modules will get 'jquery-private'
|
||||||
// for their 'jquery' dependency.
|
// for their 'jquery' dependency.
|
||||||
'*': { 'jquery': 'jquery-private' },
|
'*': {
|
||||||
|
'jquery': 'jquery-private',
|
||||||
|
"underscore": "lodash"
|
||||||
|
},
|
||||||
// 'jquery-private' wants the real jQuery module
|
// 'jquery-private' wants the real jQuery module
|
||||||
// though. If this line was not here, there would
|
// though. If this line was not here, there would
|
||||||
// be an unresolvable cyclic dependency.
|
// be an unresolvable cyclic dependency.
|
||||||
'jquery-private': { 'jquery': 'jquery' }
|
'jquery-private': { 'jquery': 'jquery' }
|
||||||
},
|
},
|
||||||
|
|
||||||
tpl: {
|
lodashLoader: {
|
||||||
// Configuration for requirejs-tpl
|
// Configuration for requirejs-tpl
|
||||||
// Use Mustache style syntax for variable interpolation
|
// Use Mustache style syntax for variable interpolation
|
||||||
templateSettings: {
|
templateSettings: {
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 3.0.0 (Unreleased)
|
||||||
|
- Use lodash instead of underscore.js [jcbrand]
|
||||||
|
|
||||||
## 2.0.5 (2017-02-01)
|
## 2.0.5 (2017-02-01)
|
||||||
- #743, #751, #753 Update to Strophe 1.2.12. SASL-EXTERNAL now has reduced priority, so it won't
|
- #743, #751, #753 Update to Strophe 1.2.12. SASL-EXTERNAL now has reduced priority, so it won't
|
||||||
be prioritized above other auth mechanisms. [jcbrand]
|
be prioritized above other auth mechanisms. [jcbrand]
|
||||||
|
@ -53,15 +53,15 @@
|
|||||||
"jquery.browser": ">=0.1.0",
|
"jquery.browser": ">=0.1.0",
|
||||||
"jshint": "^2.9.4",
|
"jshint": "^2.9.4",
|
||||||
"lodash": "^4.17.4",
|
"lodash": "^4.17.4",
|
||||||
|
"lodash-template-loader": "^2.0.0",
|
||||||
"moment": "~2.13.0",
|
"moment": "~2.13.0",
|
||||||
"npm": "^4.1.1",
|
"npm": "^4.1.1",
|
||||||
"otr": "0.2.16",
|
"otr": "0.2.16",
|
||||||
"phantom-jasmine": "0.1.8",
|
"phantom-jasmine": "0.1.8",
|
||||||
"phantomjs": "~1.9.7-1",
|
"phantomjs": "~1.9.7-1",
|
||||||
"pluggable.js": "0.0.3",
|
"pluggable.js": "https://github.com/jcbrand/pluggable.js.git#d5679e907bfbc8e673f7fa23e75f21cb4a26ae57",
|
||||||
"po2json": "^0.4.4",
|
"po2json": "^0.4.4",
|
||||||
"requirejs": "2.3.2",
|
"requirejs": "2.3.2",
|
||||||
"requirejs-undertemplate": "~0.0.4",
|
|
||||||
"snyk": "^1.21.2",
|
"snyk": "^1.21.2",
|
||||||
"strophe.js": "1.2.12",
|
"strophe.js": "1.2.12",
|
||||||
"strophejs-plugins": "0.0.7",
|
"strophejs-plugins": "0.0.7",
|
||||||
|
Loading…
Reference in New Issue
Block a user