From ac867c952401f57fcb0ce9850a1656b495b37acb Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 27 Feb 2017 07:42:17 +0000 Subject: [PATCH] Rework the way builds are created. Builds are now themselves UMD modules, so they could be `require`'d like any other AMD module or they can still be used as old ES5 modules with globals. Additionally the build is now closured, so that the almond API doesn't pollute the global context with `define` or `require`. This does however mean that `require` can no longer be used outside of the build (unless requirej.s is included directly. --- dev.html | 7 +--- index.html | 73 ++++++++++++++++++++---------------------- src/converse-mobile.js | 9 +----- src/converse.js | 9 +----- tests.html | 2 +- 5 files changed, 38 insertions(+), 62 deletions(-) diff --git a/dev.html b/dev.html index 49a89f98b..58c52a55a 100644 --- a/dev.html +++ b/dev.html @@ -14,8 +14,7 @@ - - + @@ -66,11 +65,7 @@ ], auto_reconnect: true, bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes - keepalive: true, - message_carbons: true, message_archiving: 'always', - play_sounds: true, - roster_groups: true, show_controlbox_by_default: true, strict_plugin_dependencies: false, chatstate_notification_blacklist: ['mulles@movim.eu'], diff --git a/index.html b/index.html index 13276a514..38cf6ce07 100644 --- a/index.html +++ b/index.html @@ -208,46 +208,41 @@ diff --git a/src/converse-mobile.js b/src/converse-mobile.js index dd1ecc86c..f3df8ba2d 100644 --- a/src/converse-mobile.js +++ b/src/converse-mobile.js @@ -24,13 +24,6 @@ if (typeof define !== 'undefined') { "converse-headline", // Support for headline messages /* END: Removable components */ ], function (converse) { - var evt; - if (window.CustomEvent) { - evt = new CustomEvent('converse-loaded', {detail: {'converse': converse}}); - } else { - evt = document.createEvent('CustomEvent'); - evt.initCustomEvent('converse-loaded', true, true, {'converse': converse}); - } - window.dispatchEvent(evt); + return converse; }); } diff --git a/src/converse.js b/src/converse.js index 6b23c257a..2693e0d4c 100755 --- a/src/converse.js +++ b/src/converse.js @@ -26,13 +26,6 @@ if (typeof define !== 'undefined') { "converse-headline", // Support for headline messages /* END: Removable components */ ], function (converse) { - var evt; - if (window.CustomEvent) { - evt = new CustomEvent('converse-loaded', {detail: {'converse': converse}}); - } else { - evt = document.createEvent('CustomEvent'); - evt.initCustomEvent('converse-loaded', true, true, {'converse': converse}); - } - window.dispatchEvent(evt); + return converse; }); } diff --git a/tests.html b/tests.html index db0c073b0..5578f64b7 100644 --- a/tests.html +++ b/tests.html @@ -8,7 +8,7 @@ - +