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

Merge branch 'master' into roster_refactor

Browse Source
This commit is contained in:
JC Brand 2015-04-15 21:52:14 +02:00
commit 34e2cfc191
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -122,7 +122,7 @@ module.exports = function(grunt) {
done(); done();
}; };
var rjsext = (process.platform === 'win32') ? '.cmd' : ''; var rjsext = (process.platform === 'win32') ? '.cmd' : '';
var rjs = path.resolve('./node_modules/.bin/r.js' + rjsext); var rjs = '"' + path.resolve('./node_modules/.bin/r.js' + rjsext) + '"';
exec(rjs + ' -o src/build.js && ' + exec(rjs + ' -o src/build.js && ' +
rjs + ' -o src/build.js optimize=none out=builds/converse.js && ' + rjs + ' -o src/build.js optimize=none out=builds/converse.js && ' +
rjs + ' -o src/build-no-jquery.js &&' + rjs + ' -o src/build-no-jquery.js &&' +

1
converse.js
View File

@ -1501,6 +1501,7 @@
}, },
updateVCard: function () { updateVCard: function () {
if (!this.use_vcards) { return; }
var jid = this.model.get('jid'), var jid = this.model.get('jid'),
contact = converse.roster.get(jid); contact = converse.roster.get(jid);
if ((contact) && (!contact.get('vcard_updated'))) { if ((contact) && (!contact.get('vcard_updated'))) {

2
non_amd.html
View File

@ -31,7 +31,7 @@
<!-- until here --> <!-- until here -->
<script type="text/javascript" src="components/otr/build/dep/eventemitter.js"></script> <script type="text/javascript" src="components/otr/build/dep/eventemitter.js"></script>
<script type="text/javascript" src="src/otr.js"></script> <script type="text/javascript" src="src/otr.js"></script>
<script type="text/javascript" src="components/strophe/strophe.min.js"></script> <script type="text/javascript" src="components/strophejs/strophe.js"></script>
<script type="text/javascript" src="src/strophe.roster.js"></script> <script type="text/javascript" src="src/strophe.roster.js"></script>
<script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script> <script type="text/javascript" src="components/strophejs-plugins/vcard/strophe.vcard.js"></script>
<script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script> <script type="text/javascript" src="components/strophejs-plugins/disco/strophe.disco.js"></script>