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

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

Browse Source
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

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

@ -69,7 +69,9 @@ return /******/ (function(modules) { // webpackBootstrap
} }
if (typeof _ == 'function' && typeof _.runInContext == 'function') { 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; module.exports = browserConvert;

5
demo/without_bundled_dependencies.html
View File

@ -52,9 +52,10 @@
<script type="text/javascript" src="../dist/locales.js"></script> <script type="text/javascript" src="../dist/locales.js"></script>
<!-- END I18N --> <!-- 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="../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> <script src="../dist/converse-no-dependencies.js"></script>
</head> </head>
<body id="page-top" data-spy="scroll" data-target=".navbar-custom"> <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
@ -80,7 +81,6 @@
</body> </body>
<script> <script>
require(['converse'], function (converse) {
converse.initialize({ converse.initialize({
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes 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 i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
@ -90,6 +90,5 @@
roster_groups: true, roster_groups: true,
keepalive: true keepalive: true
}); });
});
</script> </script>
</html> </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.vcard",
"strophe.ping", "strophe.ping",
"otr", "otr",
"lodash" "lodash",
"lodash.converter",
"lodash.noconflict"
], ],
paths: { paths: {
"converse-bookmarks": "builds/converse-bookmarks", "converse-bookmarks": "builds/converse-bookmarks",

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

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