Make sure Strophe is available for other dep configs as well.

This commit is contained in:
JC Brand 2015-03-05 21:33:48 +01:00
parent a359dc5e88
commit e01f1ea59a
3 changed files with 29 additions and 26 deletions

View File

@ -3,19 +3,20 @@ define("converse-dependencies", [
"utils", "utils",
"otr", "otr",
"moment", "moment",
"backbone.browserStorage",
"backbone.overview",
"jquery.browser",
"typeahead",
"strophe", "strophe",
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco" "strophe.disco",
], function($, utils, otr, moment) { "backbone.browserStorage",
return { "backbone.overview",
"jquery.browser",
"typeahead"
], function($, utils, otr, moment, Strophe) {
return _.extend({
'underscore': _,
'jQuery': $, 'jQuery': $,
'moment': moment,
'otr': otr, 'otr': otr,
'moment': moment,
'utils': utils 'utils': utils
}; }, Strophe);
}); });

View File

@ -2,19 +2,20 @@ define("converse-dependencies", [
"jquery", "jquery",
"utils", "utils",
"moment", "moment",
"backbone.browserStorage",
"backbone.overview",
"jquery.browser",
"typeahead",
"strophe", "strophe",
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco" "strophe.disco",
], function($, utils, moment) { "backbone.browserStorage",
return { "backbone.overview",
"jquery.browser",
"typeahead"
], function($, utils, moment, Strophe) {
return _.extend({
'underscore': _,
'jQuery': $, 'jQuery': $,
'otr': undefined, 'otr': undefined,
'moment': moment, 'moment': moment,
'utils': utils 'utils': utils
}; }, Strophe);
}); });

View File

@ -2,21 +2,22 @@ define("converse-dependencies", [
"jquery", "jquery",
"utils", "utils",
"moment", "moment",
"strophe",
"strophe.roster",
"strophe.vcard",
"strophe.disco",
"bootstrapJS", // XXX: Can be removed, only for https://conversejs.org "bootstrapJS", // XXX: Can be removed, only for https://conversejs.org
"backbone.browserStorage", "backbone.browserStorage",
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
"jquery.easing", // XXX: Can be removed, only for https://conversejs.org "jquery.easing", // XXX: Can be removed, only for https://conversejs.org
"typeahead", "typeahead"
"strophe", ], function($, utils, moment, Strophe) {
"strophe.roster", return _.extend({
"strophe.vcard", 'underscore': _,
"strophe.disco"
], function($, utils, moment) {
return {
'jQuery': $, 'jQuery': $,
'otr': undefined, 'otr': otr,
'moment': moment, 'moment': moment,
'utils': utils 'utils': utils
}; }, Strophe);
}); });