Fix random fails in FF due to different module loading times

According to the require.js documentation, if you are using "require" in HTML, then the data-main attribute should not be used. http://www.requirejs.org/docs/api.html#data-main So merged main.js into converse.js, which appears to solve the problem.

Fix random fails in FF due to different module loading times
According to the require.js documentation, if you are using "require" in HTML, then the data-main attribute should not be used. http://www.requirejs.org/docs/api.html#data-main So merged main.js into converse.js, which appears to solve the problem.
4a914646 · JC Brand · 4624cc2d · 4a914646 · 4a914646 · 4624cc2d
Commit 4a914646 authored Mar 07, 2016 by JC Brand
7 changed files
--- a/converse.js
+++ b/converse.js
--- a/dev.html
+++ b/dev.html
@@ -13,7 +13,7 @@
    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
    <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 data-main="main" src="components/requirejs/require.js"></script>
+    <script src="components/requirejs/require.js"></script>
 </head>

 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">

--- a/main.js
+++ b/main.js
--- a/src/build-no-dependencies.js
+++ b/src/build-no-dependencies.js
@@ -42,5 +42,5 @@
        endFile: "wrapper-end.js"
    },
    insertRequire: ['converse'],
-    mainConfigFile: '../main.js'
+    mainConfigFile: '../converse.js'
 })
--- a/src/build-no-jquery.js
+++ b/src/build-no-jquery.js
@@ -5,5 +5,5 @@
    include: ['converse'],
    exclude: ['jquery', 'jquery-private'],
    insertRequire: ['converse'],
-    mainConfigFile: '../main.js'
+    mainConfigFile: '../converse.js'
 })
--- a/src/build.js
+++ b/src/build.js
@@ -2,7 +2,7 @@
    baseUrl: "../",
    name: "components/almond/almond.js",
    out: "../dist/converse.min.js",
-    mainConfigFile: '../main.js',
+    mainConfigFile: '../converse.js',
    include: ['converse'],
    insertRequire: ['converse']
 })
--- a/tests.html
+++ b/tests.html
@@ -8,7 +8,7 @@
    <link rel="stylesheet" type="text/css" href="components/jasmine/src/html/jasmine.css">
    <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="main.js"></script>
+    <script src="converse.js"></script>
    <script data-main="tests/main" src="components/requirejs/require.js"></script>
 </head>