11 anni fa · 364c340ab5
--- a/main.js
+++ b/main.js
@@ -1,4 +1,5 @@
 
															 config = {
														
 
															+    baseUrl: '.',
														
 
															     paths: {
														
 
															         "jquery": "components/jquery/dist/jquery",
														
 
															         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
														
--- a/tests.html
+++ b/tests.html
@@ -9,7 +9,7 @@
 
															     <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
														
 
															     <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
														
 
															     <script src="main.js"></script>
														
 
															-    <script data-main="tests_main" src="components/requirejs/require.js"></script>
														
 
															+    <script data-main="tests/main" src="components/requirejs/require.js"></script>
														
 
															 </head>
														
 
															 <body>
														
--- a/tests/main.js
+++ b/tests/main.js
@@ -67,6 +67,9 @@ require([
 
															             ], function () {
														
 
															                 // Make sure this callback is only called once.
														
 
															                 delete converse.callback;
														
 
															+                // Stub the trimChat method. It causes havoc when running with
														
 
															+                // phantomJS.
														
 
															+                converse.ChatBoxView.prototype.trimChat = function () {};
														
 
															                 // Jasmine stuff
														
 
															                 var jasmineEnv = jasmine.getEnv();