Merge pull request #4831 from andrewnester/bug/4583

fix: Uncaught TypeError: Cannot read properties of undefined in worker code
ajaxorg · Jun 29, 2022 · 6b94371 · 6b94371
2 parents c7b3422 + 3b62a07
commit 6b94371
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/ace/worker/v2/worker.js b/lib/ace/worker/v2/worker.js
@@ -26,11 +26,11 @@ define(function (require, exports, module) {
       type: "error",
       data: {
         message: message,
-        data: err.data,
+        data: err && err.data,
         file: file,
         line: line,
         col: col,
-        stack: err.stack
+        stack: err && err.stack
       }
     });
   };

diff --git a/lib/ace/worker/v2/worker_client.js b/lib/ace/worker/v2/worker_client.js
@@ -190,7 +190,7 @@ define(function (require, exports, module) {
 
       this.$doc = doc;
       this.call("setValue", [doc.getValue()]);
-      doc.on("change", this.changeListener);
+      doc.on("change", this.changeListener, true);
     };
 
     this.changeListener = function (delta) {

diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js
@@ -21,11 +21,11 @@ window.ace = window;
 window.onerror = function(message, file, line, col, err) {
     postMessage({type: "error", data: {
         message: message,
-        data: err.data,
+        data: err && err.data,
         file: file,
         line: line, 
         col: col,
-        stack: err.stack
+        stack: err && err.stack
     }});
 };
 

diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js
@@ -184,7 +184,7 @@ var WorkerClient = function(worker) {
 
         this.$doc = doc;
         this.call("setValue", [doc.getValue()]);
-        doc.on("change", this.changeListener);
+        doc.on("change", this.changeListener, true);
     };
 
     this.changeListener = function(delta) {