Move converse.js to src/converse.js
Also remove "jquery", will be loaded implicitly
This commit is contained in:
parent
a51d503ea5
commit
d12309d70e
@ -16,7 +16,7 @@
|
|||||||
<script src="../config.js"></script> <!-- Base require.js configuration -->
|
<script src="../config.js"></script> <!-- Base require.js configuration -->
|
||||||
<script src="../components/requirejs/require.js"></script>
|
<script src="../components/requirejs/require.js"></script>
|
||||||
<script src="config.js"></script> <!-- Just set the baseUrl since we're in a subfolder -->
|
<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>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
|
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
|
||||||
|
2
dev.html
2
dev.html
@ -15,7 +15,7 @@
|
|||||||
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
|
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
|
||||||
<script src="node_modules/requirejs/require.js"></script>
|
<script src="node_modules/requirejs/require.js"></script>
|
||||||
<script src="config.js"></script>
|
<script src="config.js"></script>
|
||||||
<script src="converse.js"></script>
|
<script src="src/converse.js"></script>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
|
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
"converse-minimize",
|
"converse-minimize",
|
||||||
"converse-dragresize"
|
"converse-dragresize"
|
||||||
],
|
],
|
||||||
include: ['converse'],
|
include: ['src/converse'],
|
||||||
insertRequire: ['converse'],
|
insertRequire: ['converse'],
|
||||||
wrap: {
|
wrap: {
|
||||||
endFile: ["wrapper-mobile.js"]
|
endFile: ["wrapper-mobile.js"]
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
baseUrl: "../",
|
baseUrl: "../",
|
||||||
name: "almond",
|
name: "almond",
|
||||||
out: "../dist/converse-no-dependencies.min.js",
|
out: "../dist/converse-no-dependencies.min.js",
|
||||||
include: ['converse'],
|
include: ['src/converse'],
|
||||||
excludeShallow: [
|
excludeShallow: [
|
||||||
'locales',
|
'locales',
|
||||||
'text!af',
|
'text!af',
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
baseUrl: "../",
|
baseUrl: "../",
|
||||||
name: "almond",
|
name: "almond",
|
||||||
out: "../dist/converse.nojquery.min.js",
|
out: "../dist/converse.nojquery.min.js",
|
||||||
include: ['converse'],
|
include: ['src/converse'],
|
||||||
exclude: ['jquery', 'jquery-private'],
|
exclude: ['jquery', 'jquery-private'],
|
||||||
insertRequire: ['converse'],
|
insertRequire: ['converse'],
|
||||||
mainConfigFile: '../config.js',
|
mainConfigFile: '../config.js',
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
name: "almond",
|
name: "almond",
|
||||||
out: "../dist/converse.min.js",
|
out: "../dist/converse.min.js",
|
||||||
mainConfigFile: '../config.js',
|
mainConfigFile: '../config.js',
|
||||||
include: ['converse'],
|
include: ['src/converse'],
|
||||||
insertRequire: ['converse'],
|
insertRequire: ['converse'],
|
||||||
})
|
})
|
||||||
|
@ -7,7 +7,6 @@
|
|||||||
if (typeof define !== 'undefined') {
|
if (typeof define !== 'undefined') {
|
||||||
/* When running tests, define is not defined. */
|
/* When running tests, define is not defined. */
|
||||||
define("converse", [
|
define("converse", [
|
||||||
"jquery",
|
|
||||||
"converse-api",
|
"converse-api",
|
||||||
|
|
||||||
/* START: Removable components
|
/* START: Removable components
|
||||||
@ -34,7 +33,7 @@ if (typeof define !== 'undefined') {
|
|||||||
"converse-headline", // Support for headline messages
|
"converse-headline", // Support for headline messages
|
||||||
/* END: Removable components */
|
/* END: Removable components */
|
||||||
|
|
||||||
], function($, converse_api) {
|
], function(converse_api) {
|
||||||
window.converse = converse_api;
|
window.converse = converse_api;
|
||||||
$(window).trigger('converse-loaded', converse_api);
|
$(window).trigger('converse-loaded', converse_api);
|
||||||
return converse_api;
|
return converse_api;
|
Loading…
Reference in New Issue
Block a user