From e5e8539f2b4312edf2e17d0f702ed98fcc9a846b Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 3 Feb 2015 22:39:03 +0100
Subject: [PATCH] Fix the non-AMD usecase.

---
 converse.js  | 47 +++++++++++++++++++++++++++++++----------------
 non_amd.html |  4 ++--
 2 files changed, 33 insertions(+), 18 deletions(-)

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 @@
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
 
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+    <script type="text/javascript" src="components/jquery/dist/jquery.js"></script>
     <script type="text/javascript" src="components/otr/build/dep/salsa20.js"></script>
     <script type="text/javascript" src="src/bigint.js"></script>
     <!-- CryptoJS -->
@@ -31,7 +31,7 @@
     <!-- until here -->
     <script type="text/javascript" src="components/otr/build/dep/eventemitter.js"></script>
     <script type="text/javascript" src="src/otr.js"></script>
-    <script type="text/javascript" src="components/strophe/strophe.js"></script>
+    <script type="text/javascript" src="components/strophe/strophe.min.js"></script>
     <script type="text/javascript" src="src/strophe.roster.js"></script>
     <script type="text/javascript" src="components/strophe.muc/index.js"></script>
     <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>