From ef2aa0d2492977a32f43c1901d8a362f90108fdc Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 30 Oct 2017 12:55:56 -0700 Subject: [PATCH] client: Fix error scope related bitrot. --- modules/static/charybdis/error.js | 4 ++-- modules/static/charybdis/io.request.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/static/charybdis/error.js b/modules/static/charybdis/error.js index ce6e9b8d0..5d21904da 100644 --- a/modules/static/charybdis/error.js +++ b/modules/static/charybdis/error.js @@ -116,7 +116,7 @@ window.addEventListener("error", (msg, url, line, column, error) => mc.abort( * Where exceptions are sent after being handled (or not) in some JS callstack. This * propagates the exception to the DOM for display to the user, and eventually if no * viable DOM catch directive displays it, propagation continues to the root element - * of the application which will smother the whole app with the error. + * of the application which will smother the whole app with the black screen of doom. */ mc.unhandled = function(error) { @@ -128,7 +128,7 @@ mc.unhandled = function(error) try { - let root = mc.root_scope(); + let root = mc.ng.root(); root.error = error; } catch(e) diff --git a/modules/static/charybdis/io.request.js b/modules/static/charybdis/io.request.js index 88a902dfc..af369983a 100644 --- a/modules/static/charybdis/io.request.js +++ b/modules/static/charybdis/io.request.js @@ -517,7 +517,7 @@ mc.io.request.error = function(event) message: !empty(this.reason)? this.reason: response && xhr.responseType == "text"? response: - "There may be a network connectivity problem.", + "Unknown error. There may be a network connectivity problem.", request_stack: this.stack,