Bug 1382340 - Fix search in about:telemetry r?chutten draft
authorflyingrub <flyinggrub@gmail.com>
Wed, 19 Jul 2017 21:32:48 +0200
changeset 611604 3e283fd3bf6429ad28532a0b3aa3fa841855825b
parent 610973 1b065ffd8a535a0ad4c39a912af18e948e6a42c1
child 638200 c5f60766f4062f12fd2f990aa99e4aa08c05e6e5
push id69263
push userbmo:flyinggrub@gmail.com
push dateWed, 19 Jul 2017 21:45:13 +0000
reviewerschutten
bugs1382340, 1378759
milestone56.0a1
Bug 1382340 - Fix search in about:telemetry r?chutten Introducing a destructuring assignement in the Bug 1378759 caused the search throw an exception. The code was tested only in certain circumstances where the bug wasn't triggered. MozReview-Commit-ID: EWkKJhxMIuy
toolkit/content/aboutTelemetry.js
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -1388,33 +1388,31 @@ var Search = {
       try {
         filter = RegExp(r[1], r[2]);
       } catch (e) { // Incomplete or bad RegExp - always no match
         isPassFunc = function() {
           return false;
         };
       }
     }
-    return {filter, isPassFunc}
+    return [isPassFunc, filter]
   },
 
   filterElements(elements, filterText) {
     let [isPassFunc, filter] = this.chooseFilter(filterText);
 
     let needLowerCase = (isPassFunc === this.isPassText);
     for (let element of elements) {
       let subject = needLowerCase ? element.id.toLowerCase() : element.id;
       element.hidden = !isPassFunc(subject, filter);
     }
   },
 
   filterKeyedElements(keyedElements, filterText) {
-    let res = this.chooseFilter(filterText);
-    let isPassFunc = res.isPassFunc;
-    let filter = res.filter;
+    let [isPassFunc, filter] = this.chooseFilter(filterText);
 
     let needLowerCase = (isPassFunc === this.isPassText);
     keyedElements.forEach((keyedElement) => {
       let subject = needLowerCase ? keyedElement.key.id.toLowerCase() : keyedElement.key.id;
       if (!isPassFunc(subject, filter)) { // If the keyedHistogram's name is not matched
         let allElementHidden = true;
         for (let element of keyedElement.datas) {
           let subject = needLowerCase ? element.id.toLowerCase() : element.id;