Explorar o código

Use classList API

JC Brand %!s(int64=8) %!d(string=hai) anos
pai
achega
d2eadbdce4
Modificáronse 2 ficheiros con 7 adicións e 7 borrados
  1. 4 4
      spec/controlbox.js
  2. 3 3
      src/converse-rosterview.js

+ 4 - 4
spec/controlbox.js

@@ -115,15 +115,15 @@
                         });
                         });
                         _converse.rosterview.update(); // XXX: Will normally called as event handler
                         _converse.rosterview.update(); // XXX: Will normally called as event handler
                     }
                     }
-                    test_utils.waitUntil(function () {
+                    return test_utils.waitUntil(function () {
                         if (_converse.rosterview.$roster.hasScrollBar()) {
                         if (_converse.rosterview.$roster.hasScrollBar()) {
                             return $filter.is(':visible');
                             return $filter.is(':visible');
                         } else {
                         } else {
                             return !$filter.is(':visible');
                             return !$filter.is(':visible');
                         }
                         }
-                    }).then(function () {
-                        done();
-                    });
+                }).then(function () {
+                    done();
+                });
                 });
                 });
             }));
             }));
 
 

+ 3 - 3
src/converse-rosterview.js

@@ -166,12 +166,12 @@
                 },
                 },
 
 
                 renderClearButton: function () {
                 renderClearButton: function () {
-                    var $roster_filter = this.$('.roster-filter');
-                    $roster_filter[this.tog($roster_filter.val())]('x');
+                    var roster_filter = this.el.querySelector('.roster-filter');
+                    roster_filter.classList[this.tog(roster_filter.value)]('x');
                 },
                 },
 
 
                 tog: function (v) {
                 tog: function (v) {
-                    return v?'addClass':'removeClass';
+                    return v?'add':'remove';
                 },
                 },
 
 
                 toggleX: function (ev) {
                 toggleX: function (ev) {