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

4d2c807c · JC Brand · 93e67567 · 4d2c807c · 4d2c807c · 4d2c807c
Commit 4d2c807c authored Aug 09, 2017 by JC Brand
6 changed files
--- a/3rdparty/lodash.fp.js
+++ b/3rdparty/lodash.fp.js
@@ -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
 /***/ }
 /******/ ])
 });
-;
\ No newline at end of file
+;
--- a/demo/without_bundled_dependencies.html
+++ b/demo/without_bundled_dependencies.html
@@ -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>
--- a/dist/converse-no-dependencies.js
+++ b/dist/converse-no-dependencies.js
--- a/src/build-no-dependencies.js
+++ b/src/build-no-dependencies.js
@@ -36,7 +36,9 @@
        "strophe.vcard",
        "strophe.ping",
        "otr",
-        "lodash"
+        "lodash",
+        "lodash.converter",
+        "lodash.noconflict"
    ],
    paths: {
        "converse-bookmarks":       "builds/converse-bookmarks",

--- a/src/config.js
+++ b/src/config.js
@@ -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

--- a/src/end-no-dependencies.frag
+++ b/src/end-no-dependencies.frag
@@ -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 () {