Update browser test list

[mirror_novnc.git] / app / error-handler.js

diff --git a/app/error-handler.js b/app/error-handler.js
index 8ac7879e1dadaffa930b20d2a88a3fd5d9d7270f..5a2650fa87fa90b3cb0a3ca63ffd7e65d8ba171c 100644 (file)
--- a/app/error-handler.js
+++ b/app/error-handler.js
@@ -6,20 +6,10 @@
 (function(){
     "use strict";
 
-    function convertNewlines(msg, parentElem) {
-        const lines = msg.split("\n");
-        lines.forEach(function (line) {
-            parentElem.appendChild(document.createElement("br"));
-            parentElem.appendChild(document.createTextNode(line));
-        });
-        parentElem.removeChild(parentElem.firstChild);
-        return parentElem;
-    }
-
     // Fallback for all uncought errors
     function handleError (event, err) {
         try {
-            const msg = document.getElementById('noVNC_fallback_errormsg');
+            var msg = document.getElementById('noVNC_fallback_errormsg');
 
             // Only show the initial error
             if (msg.hasChildNodes()) {
@@ -28,18 +18,24 @@
 
             var div = document.createElement("div");
             div.classList.add('noVNC_message');
-            convertNewlines(event.message, div);
+            div.appendChild(document.createTextNode(event.message));
             msg.appendChild(div);
 
-            if (event.filename !== undefined && event.lineno !== undefined && event.colno !== undefined) {
+            if (event.filename) {
                 div = document.createElement("div");
                 div.className = 'noVNC_location';
-                    const text = event.filename + ":" + event.lineno + ":" + event.colno;
-                    div.appendChild(document.createTextNode(text));
+                var text = event.filename;
+                if (event.lineno !== undefined) {
+                    text += ":" + event.lineno;
+                    if (event.colno !== undefined) {
+                        text += ":" + event.colno;
+                    }
+                }
+                div.appendChild(document.createTextNode(text));
                 msg.appendChild(div);
             }
 
-            if (err && (err.stack !== undefined)) {
+            if (err && err.stack) {
                 div = document.createElement("div");
                 div.className = 'noVNC_stack';
                 div.appendChild(document.createTextNode(err.stack));