Merge branch '3.99' into 4.0

2021-07-20 17:55:18 -07:00
parent e399953174 10601f5af6
commit a27280e9e7
3 changed files with 61 additions and 0 deletions
--- a/src/core/base.js
+++ b/src/core/base.js
@@ -99,9 +99,21 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
  };

  j$.isError_ = function(value) {
+    if (!value) {
+      return false;
+    }
+
    if (value instanceof Error) {
      return true;
    }
+    if (
+      typeof window !== 'undefined' &&
+      typeof window.trustedTypes !== 'undefined'
+    ) {
+      return (
+        typeof value.stack === 'string' && typeof value.message === 'string'
+      );
+    }
    if (value && value.constructor && value.constructor.constructor) {
      var valueGlobal = value.constructor.constructor('return this');
      if (j$.isFunction_(valueGlobal)) {