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

Fixes #220. Enable usage of both `_` and `fp` in non-AMD case

This commit is contained in:
JC Brand 2017-08-09 17:35:48 +02:00
parent 93e67567ce
commit 4d2c807cf2
6 changed files with 112 additions and 1090 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdparty/lodash.fp.js vendored
View File

@ -69,7 +69,9 @@ return /******/ (function(modules) { // webpackBootstrap
}
if (typeof _ == 'function' && typeof _.runInContext == 'function') {
_ = browserConvert(_.runInContext());
// XXX: Customization in order to be able to run both _ and fp in the
// non-AMD usecase.
fp = browserConvert(_.runInContext());
}
module.exports = browserConvert;
@ -1037,4 +1039,4 @@ return /******/ (function(modules) { // webpackBootstrap
/***/ }
/******/ ])
});
;
;

21
demo/without_bundled_dependencies.html
View File

@ -52,9 +52,10 @@
<script type="text/javascript" src="../dist/locales.js"></script>
<!-- END I18N -->
<script type="text/javascript" src="../node_modules/awesomplete/awesomplete.js"></script>
<script type="text/javascript" src="../node_modules/awesomplete-avoid-xss/awesomplete.js"></script>
<script type="text/javascript" src="../node_modules/moment/min/moment-with-locales.js"></script>
<script type="text/javascript" src="../3rdparty/lodash.fp.js"></script>
<script src="../dist/converse-no-dependencies.js"></script>
</head>
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
@ -80,16 +81,14 @@
</body>
<script>
require(['converse'], function (converse) {
converse.initialize({
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false,
show_controlbox_by_default: true,
debug: true,
roster_groups: true,
keepalive: true
});
converse.initialize({
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false,
show_controlbox_by_default: true,
debug: true,
roster_groups: true,
keepalive: true
});
</script>
</html>

1168
dist/converse-no-dependencies.js vendored
View File

File diff suppressed because it is too large Load Diff

4
src/build-no-dependencies.js
View File

@ -36,7 +36,9 @@
"strophe.vcard",
"strophe.ping",
"otr",
"lodash"
"lodash",
"lodash.converter",
"lodash.noconflict"
],
paths: {
"converse-bookmarks": "builds/converse-bookmarks",

2
src/config.js
View File

@ -44,7 +44,7 @@ require.config({
"typeahead": "components/typeahead.js/index",
"underscore": "src/underscore-shim",
"utils": "src/utils",
"xss.noconflict": "src/xss.noconflict",
"xss.noconflict": "src/xss.noconflict",
"xss": "node_modules/xss/dist/xss",
// Converse

1
src/end-no-dependencies.frag
View File

@ -4,6 +4,7 @@
define('jquery.browser', [], function () { return jQuery; });
define('awesomplete', [], function () { return jQuery; });
define('lodash', [], function () { return _; });
define('lodash.converter', [], function () { return fp; });
define('lodash.noconflict', [], function () { return _; });
define('moment_with_locales', [], function () { return moment; });
define('strophe', [], function () {