Commit da23015c authored by JC Brand's avatar JC Brand

Massage require.js's config so that builds work

without underscore.js
parent 63888dd4
...@@ -45,6 +45,7 @@ require.config({ ...@@ -45,6 +45,7 @@ require.config({
"tpl": "node_modules/lodash-template-loader/loader", "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": "src/underscore-shim",
"utils": "src/utils", "utils": "src/utils",
// Converse // Converse
...@@ -190,6 +191,8 @@ require.config({ ...@@ -190,6 +191,8 @@ require.config({
// for their 'jquery' dependency. // for their 'jquery' dependency.
'*': { '*': {
'jquery': 'jquery-private', 'jquery': 'jquery-private',
},
'backbone': {
"underscore": "lodash" "underscore": "lodash"
}, },
// 'jquery-private' wants the real jQuery module // 'jquery-private' wants the real jQuery module
...@@ -222,6 +225,7 @@ require.config({ ...@@ -222,6 +225,7 @@ require.config({
'bigint': { deps: ['crypto'] }, 'bigint': { deps: ['crypto'] },
'strophe.ping': { deps: ['strophe'] }, 'strophe.ping': { deps: ['strophe'] },
'strophe.register': { deps: ['strophe'] }, 'strophe.register': { deps: ['strophe'] },
'strophe.vcard': { deps: ['strophe'] } 'strophe.vcard': { deps: ['strophe'] },
'backbone': { deps: ['underscore'] }
} }
}); });
/*global define */
define('underscore', ['lodash'], function (_) {
return _;
});
...@@ -3,6 +3,7 @@ define('jquery', [], function () { return jQuery; }); ...@@ -3,6 +3,7 @@ define('jquery', [], function () { return jQuery; });
define('jquery.browser', [], function () { return jQuery; }); define('jquery.browser', [], function () { return jQuery; });
define('typeahead', [], function () { return jQuery; }); define('typeahead', [], function () { return jQuery; });
define('lodash', [], function () { return _; }); define('lodash', [], function () { return _; });
define('underscore', [], function () { return _; });
define('moment_with_locales', [], function () { return moment; }); define('moment_with_locales', [], function () { return moment; });
define('strophe', [], function () { define('strophe', [], function () {
return { return {
......
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