Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Fix non_amd.html

Browse Source 
- converse-muc.js was overriding the global "converse" variable
  with undefind (the factory function didn't return anything)
- locales was not defined in utils.js in non AMD (not passed in
  the factory function)
This commit is contained in:
rlanvin 2016-02-17 09:45:53 +02:00
parent a687e87e01
commit 00caccd1a3
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
non_amd.html Normal file → Executable file
View File

@ -47,7 +47,8 @@
<script type="text/javascript" src="builds/locales.js"></script>
<script type="text/javascript" src="builds/templates.js"></script>
<script type="text/javascript" src="src/utils.js"></script>
<script type="text/javascript" src="converse.js"></script>
<script type="text/javascript" src="src/converse-core.js"></script>
<script type="text/javascript" src="src/converse-muc.js"></script>
</head>
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
<section class="intro">

2
src/converse-muc.js Normal file → Executable file
View File

@ -19,7 +19,7 @@
// In this case, the dependencies need to be available already as
// global variables, and should be loaded separately via *script* tags.
// See the file **non_amd.html** for an example of this usecase.
root.converse = factory(converse, utils);
factory(converse, utils);
}
}(this, function (converse_api, utils) {
// Strophe methods for building stanzas

4
src/utils.js Normal file → Executable file
View File

@ -1,9 +1,9 @@
/*global jQuery, templates, escape, Jed, _ */
/*global jQuery, templates, escape, Jed, _, locales */
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
define(["jquery", "underscore", "converse-templates", "locales"], factory);
} else {
root.utils = factory(jQuery, _, templates);
root.utils = factory(jQuery, _, templates, locales);
}
}(this, function ($, _, templates, locales) {
"use strict";