浏览代码

Some work on removing jquery from the controlbox code

JC Brand 7 年之前
父节点
当前提交
5939f11192
共有 1 个文件被更改,包括 9 次插入9 次删除
  1. 9 9
      src/converse-controlbox.js

+ 9 - 9
src/converse-controlbox.js

@@ -623,8 +623,8 @@
                     this.el.querySelector('.search-xmpp div').innerHTML = this.generateAddContactHTML();
                     this.el.querySelector('.search-xmpp div').innerHTML = this.generateAddContactHTML();
                     var dropdown = this.el.querySelector('.contact-form-container');
                     var dropdown = this.el.querySelector('.contact-form-container');
                     utils.slideToggleElement(dropdown).then(() => {
                     utils.slideToggleElement(dropdown).then(() => {
-                        if ($(dropdown).is(':visible')) {
-                            $(dropdown).find('input.username').focus();
+                        if (utils.isVisible(dropdown)) {
+                            dropdown.querySelector('input.username').focus();
                         }
                         }
                     });
                     });
                 },
                 },
@@ -655,8 +655,8 @@
 
 
                 addContactFromForm (ev) {
                 addContactFromForm (ev) {
                     ev.preventDefault();
                     ev.preventDefault();
-                    const $input = $(ev.target).find('input');
-                    const jid = $input.val();
+                    const input = ev.target.querySelector('input');
+                    const jid = input.value;
                     if (!jid || _.filter(jid.split('@')).length < 2) {
                     if (!jid || _.filter(jid.split('@')).length < 2) {
                         this.el.querySelector('.search-xmpp div').innerHTML =
                         this.el.querySelector('.search-xmpp div').innerHTML =
                             this.generateAddContactHTML({
                             this.generateAddContactHTML({
@@ -673,11 +673,11 @@
 
 
                 addContactFromList (ev) {
                 addContactFromList (ev) {
                     ev.preventDefault();
                     ev.preventDefault();
-                    const $target = $(ev.target),
-                        jid = $target.attr('data-recipient'),
-                        name = $target.text();
+                    const jid = ev.target.getAttribute('data-recipient'),
+                        name = ev.target.textContent;
                     _converse.roster.addAndSubscribe(jid, name);
                     _converse.roster.addAndSubscribe(jid, name);
-                    $target.parent().remove();
+                    const parent = ev.target.parentNode;
+                    parent.parentNode.removeChild(parent);
                     utils.slideIn(this.el.querySelector('.contact-form-container'));
                     utils.slideIn(this.el.querySelector('.contact-form-container'));
                 }
                 }
             });
             });
@@ -752,7 +752,7 @@
 
 
                 onClick (e) {
                 onClick (e) {
                     e.preventDefault();
                     e.preventDefault();
-                    if ($("div#controlbox").is(':visible')) {
+                    if (utils.isVisible(document.querySelector("#controlbox"))) {
                         const controlbox = _converse.chatboxes.get('controlbox');
                         const controlbox = _converse.chatboxes.get('controlbox');
                         if (_converse.connection.connected) {
                         if (_converse.connection.connected) {
                             controlbox.save({closed: true});
                             controlbox.save({closed: true});