From d12309d70e4483e027463d3f9d095c4305a757af Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 20 Oct 2016 12:40:51 +0000 Subject: [PATCH] Move converse.js to src/converse.js Also remove "jquery", will be loaded implicitly --- demo/anonymous.html | 2 +- dev.html | 2 +- src/build-mobile.js | 2 +- src/build-no-dependencies.js | 2 +- src/build-no-jquery.js | 2 +- src/build.js | 2 +- converse.js => src/converse.js | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) rename converse.js => src/converse.js (97%) diff --git a/demo/anonymous.html b/demo/anonymous.html index 33456d6da..1a1c191a5 100644 --- a/demo/anonymous.html +++ b/demo/anonymous.html @@ -16,7 +16,7 @@ - + diff --git a/dev.html b/dev.html index c7681be53..3be812e75 100644 --- a/dev.html +++ b/dev.html @@ -15,7 +15,7 @@ - + diff --git a/src/build-mobile.js b/src/build-mobile.js index 18967600c..9d03bed3b 100644 --- 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"] diff --git a/src/build-no-dependencies.js b/src/build-no-dependencies.js index 5d0e56204..752c9f853 100644 --- 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', diff --git a/src/build-no-jquery.js b/src/build-no-jquery.js index 26c7ec938..0354b38f7 100644 --- 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', diff --git a/src/build.js b/src/build.js index 99bb034ca..4acfe29de 100644 --- 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'], }) diff --git a/converse.js b/src/converse.js similarity index 97% rename from converse.js rename to src/converse.js index 5fd05dcd7..6d590e05c 100755 --- a/converse.js +++ b/src/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;