Commit e109c54c authored by JC Brand's avatar JC Brand

Avoid having a separate configuration in demo folder

parent 0da920e2
...@@ -11,6 +11,7 @@ to, either your own, or a public one. ...@@ -11,6 +11,7 @@ to, either your own, or a public one.
## Demo ## Demo
A live demo is available at [https://conversejs.org](https://conversejs.org) A live demo is available at [https://conversejs.org](https://conversejs.org)
A demo showing anonymous login is available at [https://conversejs.org/demo/anonymous.html](https://conversejs.org/demo/anonymous.html)
## Documentation ## Documentation
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* This file is used to tell require.js which components (or plugins) to load * This file is used to tell require.js which components (or plugins) to load
* when it generates a build. * when it generates a build.
*/ */
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", [
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
<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="../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/theme.css" />
<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="../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> <script src="config.js"></script> <!-- Just set the baseUrl since we're in a subfolder -->
<script src="../converse.js"></script> <script src="../converse.js"></script>
</head> </head>
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
baseUrl: "../", baseUrl: "../",
name: "components/almond/almond.js", name: "components/almond/almond.js",
out: "../dist/converse-mobile.min.js", out: "../dist/converse-mobile.min.js",
mainConfigFile: '../converse.js', mainConfigFile: '../config.js',
excludeShallow: [ excludeShallow: [
"converse-minimize", "converse-minimize",
"converse-dragresize" "converse-dragresize"
......
...@@ -42,5 +42,5 @@ ...@@ -42,5 +42,5 @@
endFile: ["wrapper-no-jquery.js", "wrapper-no-deps.js"] endFile: ["wrapper-no-jquery.js", "wrapper-no-deps.js"]
}, },
insertRequire: ['converse'], insertRequire: ['converse'],
mainConfigFile: '../converse.js' mainConfigFile: '../config.js'
}) })
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
include: ['converse'], include: ['converse'],
exclude: ['jquery', 'jquery-private'], exclude: ['jquery', 'jquery-private'],
insertRequire: ['converse'], insertRequire: ['converse'],
mainConfigFile: '../converse.js', mainConfigFile: '../config.js',
wrap: { wrap: {
endFile: "wrapper-no-jquery.js" endFile: "wrapper-no-jquery.js"
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
baseUrl: "../", baseUrl: "../",
name: "components/almond/almond.js", name: "components/almond/almond.js",
out: "../dist/converse.min.js", out: "../dist/converse.min.js",
mainConfigFile: '../converse.js', mainConfigFile: '../config.js',
include: ['converse'], include: ['converse'],
insertRequire: ['converse'] insertRequire: ['converse'],
}) })
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment