Remove unused util functions

- isOfType
- isInstance
- rootContains
- createFragmentFromText
- interpolate
- matchesSelector

src/headless/utils/core.js

@@ -138,9 +138,9 @@ export function prefixMentions (message) {
     return text;
 }
 
-u.isTagEqual = function (stanza, name) {
+function isTagEqual (stanza, name) {
     if (stanza.tree?.()) {
-        return u.isTagEqual(stanza.tree(), name);
+        return isTagEqual(stanza.tree(), name);
     } else if (!(stanza instanceof Element)) {
         throw Error(
             "isTagEqual called with value which isn't "+
@@ -300,28 +300,14 @@ function stringToElement (s) {
     return div.firstElementChild;
 }
 
-/**
- * Checks whether the DOM element matches the given selector.
- * @method u#matchesSelector
- * @param {HTMLElement} el - The DOM element
- * @param {string} selector - The selector
- */
-function matchesSelector (el, selector) {
-    const match = (
-        el.matches ||
-        el.webkitMatchesSelector
-    );
-    return match ? match.call(el, selector) : false;
-}
-
 /**
  * Returns a list of children of the DOM element that match the selector.
  * @method u#queryChildren
  * @param {HTMLElement} el - the DOM element
  * @param {string} selector - the selector they should be matched against
  */
-function queryChildren  (el, selector) {
-    return Array.from(el.childNodes).filter(el => u.matchesSelector(el, selector));
+function queryChildren (el, selector) {
+    return Array.from(el.childNodes).filter(el => (el instanceof Element) && el.matches(selector));
 }
 
 u.contains = function (attr, query) {
@@ -337,14 +323,6 @@ u.contains = function (attr, query) {
     };
 };
 
-u.isOfType = function (type, item) {
-    return item.get('type') == type;
-};
-
-u.isInstance = function (type, item) {
-    return item instanceof type;
-};
-
 u.getAttribute = function (key, item) {
     return item.get(key);
 };
@@ -355,30 +333,6 @@ u.contains.not = function (attr, query) {
     };
 };
 
-u.rootContains = function (root, el) {
-    // The document element does not have the contains method in IE.
-    if (root === document && !root.contains) {
-        return document.head.contains(el) || document.body.contains(el);
-    }
-    return root.contains ? root.contains(el) : window.HTMLElement.prototype.contains.call(root, el);
-};
-
-u.createFragmentFromText = function (markup) {
-    /* Returns a DocumentFragment containing DOM nodes based on the
-     * passed-in markup text.
-     */
-    // http://stackoverflow.com/questions/9334645/create-node-from-markup-string
-    var frag = document.createDocumentFragment(),
-        tmp = document.createElement('body'), child;
-    tmp.innerHTML = markup;
-    // Append elements in a loop to a DocumentFragment, so that the
-    // browser does not re-render the document for each node.
-    while (child = tmp.firstChild) {  // eslint-disable-line no-cond-assign
-        frag.appendChild(child);
-    }
-    return frag
-};
-
 u.isPersistableModel = function (model) {
     return model.collection && model.collection.browserStorage;
 };
@@ -386,14 +340,6 @@ u.isPersistableModel = function (model) {
 u.getResolveablePromise = getOpenPromise;
 u.getOpenPromise = getOpenPromise;
 
-u.interpolate = function (string, o) {
-    return string.replace(/{{{([^{}]*)}}}/g,
-        (a, b) => {
-            var r = o[b];
-            return typeof r === 'string' || typeof r === 'number' ? r : a;
-        });
-};
-
 /**
  * Call the callback once all the events have been triggered
  * @private
@@ -499,7 +445,7 @@ function placeCaretAtEnd (textarea) {
 }
 
 /**
- * @param {string} suffix
+ * @param {string} [suffix]
  * @return {string}
  */
 export function getUniqueId (suffix) {
@@ -669,8 +615,8 @@ export default Object.assign({
     isElement,
     isEmptyMessage,
     isErrorObject,
+    isTagEqual,
     isValidJID,
-    matchesSelector,
     merge,
     placeCaretAtEnd,
     prefixMentions,

src/plugins/adhoc-views/tests/adhoc.js

@@ -226,6 +226,7 @@ describe("Ad-hoc commands consisting of multiple steps", function () {
         `));
 
         let button = await u.waitUntil(() => modal.querySelector('input[data-action="next"]'));
+        debugger;
         button.click();
 
         sel = `iq[to="${entity_jid}"] command[sessionid="${sessionid}"]`;

src/plugins/muc-views/tests/muc.js

@@ -1742,7 +1742,7 @@ describe("Groupchats", function () {
             sizzle('[name="muc#roomconfig_roomname"]', view).pop().value = "New room name"
             view.querySelector('.chatroom-form input[type="submit"]').click();
 
-            iq = await u.waitUntil(() => IQs.filter(iq => u.matchesSelector(iq, `iq[to="${muc_jid}"][type="set"]`)).pop());
+            iq = await u.waitUntil(() => IQs.filter(iq => iq.matches(`iq[to="${muc_jid}"][type="set"]`)).pop());
             const result = $iq({
                 "xmlns": "jabber:client",
                 "type": "result",