Merge branch 'master' of https://github.com/ryanmurakami/handlebars.js

1 files changed, 15 insertions, 4 deletions

diff --git a/lib/handlebars/exception.js b/lib/handlebars/exception.js
index 52499c0..af675d9 100644
--- a/lib/handlebars/exception.js
+++ b/lib/handlebars/exception.js
@@ -12,7 +12,7 @@ function Exception(message, node) {
     message += ' - ' + line + ':' + column;
   }
 
-  let tmp = Error.prototype.constructor.call(this, message);
+  let tmp = Error.prototype.constructor.call(this, message, loc && loc.source, line);
 
   // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
   for (let idx = 0; idx < errorProps.length; idx++) {
@@ -24,9 +24,20 @@ function Exception(message, node) {
     Error.captureStackTrace(this, Exception);
   }
 
-  if (loc) {
-    this.lineNumber = line;
-    this.column = column;
+  try {
+    if (loc) {
+      this.lineNumber = line;
+
+      // Work around issue under safari where we can't directly set the column value
+      /* istanbul ignore next */
+      if (Object.defineProperty) {
+        Object.defineProperty(this, 'column', {value: column});
+      } else {
+        this.column = column;
+      }
+    }
+  } catch (nop) {
+    /* Ignore if the browser is very particular */
   }
 }