diff --git a/converse.js b/converse.js
index 1507b4ef6..6b1ed2b45 100644
--- a/converse.js
+++ b/converse.js
@@ -12,26 +12,41 @@
define("converse",
["converse-dependencies", "converse-templates"],
function (dependencies, templates) {
- return factory(dependencies, templates);
+ return factory(
+ templates,
+ dependencies.jQuery,
+ dependencies.$iq,
+ dependencies.$msg,
+ dependencies.$pres,
+ dependencies.$build,
+ dependencies.otr ? dependencies.otr.DSA : undefined,
+ dependencies.otr ? dependencies.otr.OTR : undefined,
+ dependencies.Strophe,
+ dependencies.underscore,
+ dependencies.moment,
+ dependencies.utils,
+ dependencies.SHA1.b64_sha1
+ );
}
);
} else {
- root.converse = factory(dependencies, templates);
+ root.converse = factory(
+ templates,
+ jQuery,
+ $iq,
+ $msg,
+ $pres,
+ $build,
+ DSA,
+ OTR,
+ Strophe,
+ _,
+ moment,
+ utils,
+ b64_sha1
+ );
}
-}(this, function (dependencies, templates) {
- var $ = dependencies.jQuery;
- var $iq = dependencies.$iq;
- var $msg = dependencies.$msg;
- var $pres = dependencies.$pres;
- var $build = dependencies.$build;
- var DSA = dependencies.otr ? dependencies.otr.DSA : undefined;
- var OTR = dependencies.otr ? dependencies.otr.OTR : undefined;
- var Strophe = dependencies.Strophe;
- var _ = dependencies.underscore;
- var moment = dependencies.moment;
- var utils = dependencies.utils;
- var b64_sha1 = dependencies.SHA1.b64_sha1;
-
+}(this, function (templates, $, $iq, $msg, $pres, $build, DSA, OTR, Strophe, _, moment, utils, b64_sha1) {
// "use strict";
// Cannot use this due to Safari bug.
// See https://github.com/jcbrand/converse.js/issues/196
diff --git a/non_amd.html b/non_amd.html
index 027f68960..2aab8a2d7 100644
--- a/non_amd.html
+++ b/non_amd.html
@@ -13,7 +13,7 @@
-
+
@@ -31,7 +31,7 @@
-
+