Move converse.js to src/converse.js

Also remove "jquery", will be loaded implicitly

Move converse.js to src/converse.js
Also remove "jquery", will be loaded implicitly
d12309d7 · JC Brand · a51d503e · d12309d7 · d12309d7 · d12309d7
Commit d12309d7 authored Oct 20, 2016 by JC Brand
7 changed files
--- a/demo/anonymous.html
+++ b/demo/anonymous.html
@@ -16,7 +16,7 @@
    <script src="../config.js"></script> <!-- Base require.js configuration -->
    <script src="../components/requirejs/require.js"></script>
    <script src="config.js"></script> <!-- Just set the baseUrl since we're in a subfolder -->
-    <script src="../converse.js"></script>
+    <script src="../src/converse.js"></script>
 </head>

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

--- a/dev.html
+++ b/dev.html
@@ -15,7 +15,7 @@
    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
    <script src="node_modules/requirejs/require.js"></script>
    <script src="config.js"></script>
-    <script src="converse.js"></script>
+    <script src="src/converse.js"></script>
 </head>

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

--- a/src/build-mobile.js
+++ b/src/build-mobile.js
@@ -7,7 +7,7 @@
        "converse-minimize",
        "converse-dragresize"
    ],
-    include: ['converse'],
+    include: ['src/converse'],
    insertRequire: ['converse'],
    wrap: {
        endFile: ["wrapper-mobile.js"]

--- a/src/build-no-dependencies.js
+++ b/src/build-no-dependencies.js
@@ -2,7 +2,7 @@
    baseUrl: "../",
    name: "almond",
    out: "../dist/converse-no-dependencies.min.js",
-    include: ['converse'],
+    include: ['src/converse'],
    excludeShallow: [
        'locales',
        'text!af',

--- a/src/build-no-jquery.js
+++ b/src/build-no-jquery.js
@@ -2,7 +2,7 @@
    baseUrl: "../",
    name: "almond",
    out: "../dist/converse.nojquery.min.js",
-    include: ['converse'],
+    include: ['src/converse'],
    exclude: ['jquery', 'jquery-private'],
    insertRequire: ['converse'],
    mainConfigFile: '../config.js',

--- a/src/build.js
+++ b/src/build.js
@@ -3,6 +3,6 @@
    name: "almond",
    out: "../dist/converse.min.js",
    mainConfigFile: '../config.js',
-    include: ['converse'],
+    include: ['src/converse'],
    insertRequire: ['converse'],
 })
--- a/converse.js
+++ b/converse.js
@@ -7,7 +7,6 @@
 if (typeof define !== 'undefined') {
    /* When running tests, define is not defined. */
    define("converse", [
-        "jquery",
        "converse-api",

        /* START: Removable components
@@ -34,7 +33,7 @@ if (typeof define !== 'undefined') {
        "converse-headline",    // Support for headline messages
        /* END: Removable components */

-    ], function($, converse_api) {
+    ], function(converse_api) {
        window.converse = converse_api;
        $(window).trigger('converse-loaded', converse_api);
        return converse_api;