فهرست منبع

Use async function instead of explicit promises

JC Brand 6 سال پیش
والد
کامیت
bb78d8519f
2فایلهای تغییر یافته به همراه23 افزوده شده و 26 حذف شده
  1. 12 13
      dist/converse.js
  2. 11 13
      src/converse-omemo.js

+ 12 - 13
dist/converse.js

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

+ 11 - 13
src/converse-omemo.js

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