improves liklihood that triggered events pass Error

losandes · Aug 6, 2015 · 793929f · 793929f
1 parent af53fbe
commit 793929f
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 7 deletions.
diff --git a/examples/express/public/bower_components/hilary/release/hilary.min.js b/examples/express/public/bower_components/hilary/release/hilary.min.js
diff --git a/examples/express/public/bower_components/hilary/release/hilaryWithAMD.min.js b/examples/express/public/bower_components/hilary/release/hilaryWithAMD.min.js
diff --git a/release/hilary.js b/release/hilary.js
@@ -681,7 +681,16 @@
             },
             on: {
                 error: function(err, next) {
-                    var exception = is.string(err) ? scope.getContext().exceptionHandlers.makeException(err) : err, eventArray = $this.events.onError, event, i = 0;
+                    var exception, eventArray = $this.events.onError, event, i = 0;
+                    if (is.object(err) && err.stack) {
+                        exception = err;
+                    } else if (is.object(err)) {
+                        exception = scope.getContext().exceptionHandlers.makeException(err.name, err.message || "Hilary Error - see err.data", err);
+                    } else if (is.string(err)) {
+                        exception = scope.getContext().exceptionHandlers.makeException(err);
+                    } else {
+                        exception = err;
+                    }
                     for (i = 0; i < eventArray.length; i += 1) {
                         event = eventArray[i];
                         if (event.once) {

diff --git a/release/hilary.min.js b/release/hilary.min.js
diff --git a/release/hilaryWithAMD.js b/release/hilaryWithAMD.js
@@ -681,7 +681,16 @@
             },
             on: {
                 error: function(err, next) {
-                    var exception = is.string(err) ? scope.getContext().exceptionHandlers.makeException(err) : err, eventArray = $this.events.onError, event, i = 0;
+                    var exception, eventArray = $this.events.onError, event, i = 0;
+                    if (is.object(err) && err.stack) {
+                        exception = err;
+                    } else if (is.object(err)) {
+                        exception = scope.getContext().exceptionHandlers.makeException(err.name, err.message || "Hilary Error - see err.data", err);
+                    } else if (is.string(err)) {
+                        exception = scope.getContext().exceptionHandlers.makeException(err);
+                    } else {
+                        exception = err;
+                    }
                     for (i = 0; i < eventArray.length; i += 1) {
                         event = eventArray[i];
                         if (event.once) {

diff --git a/release/hilaryWithAMD.min.js b/release/hilaryWithAMD.min.js
diff --git a/src/hilary.js b/src/hilary.js
@@ -911,11 +911,21 @@
             on: {
                 // hilary::error (err)
                 error: function (err, next) {
-                    var exception = is.string(err) ? scope.getContext().exceptionHandlers.makeException(err) : err,
+                    var exception,
                         eventArray = $this.events.onError,
                         event,
                         i = 0;
 
+                    if (is.object(err) && err.stack) {
+                        exception = err;
+                    } else if (is.object(err)) {
+                        exception = scope.getContext().exceptionHandlers.makeException(err.name, err.message || 'Hilary Error - see err.data', err);
+                    } else if (is.string(err)) {
+                        exception = scope.getContext().exceptionHandlers.makeException(err);
+                    } else {
+                        exception = err;
+                    }
+
                     for (i = 0; i < eventArray.length; i += 1) {
                         event = eventArray[i];