From d5d30c2e093699590b2d47cbc7d18f398a13ef6c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 25 Jun 2020 14:38:21 -0400
Subject: [PATCH] guard against a few possible typeErrors

---
 www/pad/comment.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/pad/comment.js b/www/pad/comment.js
index 657722321..9936d5e46 100644
--- a/www/pad/comment.js
+++ b/www/pad/comment.js
@@ -56,7 +56,10 @@
                 path = path || editor.elementPath();
                 sel = sel || editor.getSelection();
                 var applicable = removeStyle.checkApplicable(path, editor);
-                var hasComments = editor.getSelectedHtml().$.querySelectorAll('comment').length;
+                var selectedHtml = editor.getSelectedHtml();
+                if (selectedHtml === null) { return; }
+                var comments = selectedHtml.$.querySelectorAll('comment');
+                var hasComments = comments && comments.length;
                 var isComment = removeStyle.checkActive(path, editor);
                 var empty = !sel.getSelectedText();
                 return applicable && !empty && !hasComments && !isComment;