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

Use async function instead of explicit promises

Browse Source
This commit is contained in:
JC Brand 2018-10-18 07:03:42 +02:00
parent 23cb7d31ec
commit bb78d8519f
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dist/converse.js vendored
View File

@ -72993,24 +72993,23 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
} }
}, },
renderOMEMOToolbarButton() { async renderOMEMOToolbarButton() {
const _converse = this.__super__._converse, const _converse = this.__super__._converse,
__ = _converse.__; __ = _converse.__;
const support = await _converse.contactHasOMEMOSupport(this.model.get('jid'));
_converse.contactHasOMEMOSupport(this.model.get('jid')).then(support => { if (support) {
if (support) { const icon = this.el.querySelector('.toggle-omemo'),
const icon = this.el.querySelector('.toggle-omemo'), html = tpl_toolbar_omemo(_.extend(this.model.toJSON(), {
html = tpl_toolbar_omemo(_.extend(this.model.toJSON(), { '__': __
'__': __ }));
}));
if (icon) { if (icon) {
icon.outerHTML = html; icon.outerHTML = html;
} else { } else {
this.el.querySelector('.chat-toolbar').insertAdjacentHTML('beforeend', html); this.el.querySelector('.chat-toolbar').insertAdjacentHTML('beforeend', html);
}
} }
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR)); }
}, },
toggleOMEMO(ev) { toggleOMEMO(ev) {

24
src/converse-omemo.js
View File

@ -447,20 +447,18 @@
} }
}, },
renderOMEMOToolbarButton () { async renderOMEMOToolbarButton () {
const { _converse } = this.__super__, const { _converse } = this.__super__, { __ } = _converse;
{ __ } = _converse; const support = await _converse.contactHasOMEMOSupport(this.model.get('jid'));
_converse.contactHasOMEMOSupport(this.model.get('jid')).then((support) => { if (support) {
if (support) { const icon = this.el.querySelector('.toggle-omemo'),
const icon = this.el.querySelector('.toggle-omemo'), html = tpl_toolbar_omemo(_.extend(this.model.toJSON(), {'__': __}));
html = tpl_toolbar_omemo(_.extend(this.model.toJSON(), {'__': __})); if (icon) {
if (icon) { icon.outerHTML = html;
icon.outerHTML = html; } else {
} else { this.el.querySelector('.chat-toolbar').insertAdjacentHTML('beforeend', html);
this.el.querySelector('.chat-toolbar').insertAdjacentHTML('beforeend', html);
}
} }
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.ERROR)); }
}, },
toggleOMEMO (ev) { toggleOMEMO (ev) {