Bug 1361270 - Avoid exception when searching in the Console panel; r=nchevobbe draft
authorJan Odvarko <odvarko@gmail.com>
Tue, 02 May 2017 09:13:07 +0200
changeset 571174 50bac78ff30623ce097c29076855fd5c891c0979
parent 571131 2e7c10a9b86e30691f67855f6c8f98d984508d7c
child 571332 cdc817a0f78a9b0386c278733fd78384a5302ab6
child 571408 de14051242a9ed44b763e653d1b9a15b69a8c79a
push id56706
push userjodvarko@mozilla.com
push dateTue, 02 May 2017 07:13:54 +0000
reviewersnchevobbe
bugs1361270
milestone55.0a1
Bug 1361270 - Avoid exception when searching in the Console panel; r=nchevobbe MozReview-Commit-ID: FGF3gzI4hjG
devtools/client/webconsole/new-console-output/selectors/messages.js
--- a/devtools/client/webconsole/new-console-output/selectors/messages.js
+++ b/devtools/client/webconsole/new-console-output/selectors/messages.js
@@ -123,30 +123,30 @@ function matchSearchFilters(message, fil
           functionName: frame.functionName ||
             l10n.getStr("stacktrace.anonymousFunction"),
           filename: frame.filename,
           lineNumber: frame.lineNumber,
           columnNumber: frame.columnNumber
         }))
     )
     // Look for a match in messageText.
-    || (message.messageText !== null
-          && message.messageText.toLocaleLowerCase().includes(text.toLocaleLowerCase()))
+    || (message.messageText &&
+          message.messageText.toLocaleLowerCase().includes(text.toLocaleLowerCase()))
     // Look for a match in parameters. Currently only checks value grips.
-    || (message.parameters !== null
-        && message.parameters.join("").toLocaleLowerCase()
-            .includes(text.toLocaleLowerCase()))
+    || (message.parameters &&
+        message.parameters.join("").toLocaleLowerCase()
+          .includes(text.toLocaleLowerCase()))
     // Look for a match in notes.
     || (Array.isArray(message.notes) && message.notes.some(note =>
           // Look for a match in location.
           isTextInFrame(text, note.frame)
           // Look for a match in messageBody.
-          || (note.messageBody !== null
-                && note.messageBody.toLocaleLowerCase()
-                     .includes(text.toLocaleLowerCase()))
+          || (note.messageBody &&
+                note.messageBody.toLocaleLowerCase()
+                  .includes(text.toLocaleLowerCase()))
         ))
   );
 }
 
 /**
  * Returns true if given text is included in provided stack frame.
  */
 function isTextInFrame(text, frame) {