From cc9cfd9467f6b142f07e6bc29d95ce88ce19e380 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Tue, 13 Jan 2015 12:03:14 -0700
Subject: [PATCH] I like proper error messages.

---
 builds/appchan-x.user.js    | 15 +++++----------
 builds/crx/script.js        | 15 +++++----------
 src/General/Main.coffee     |  2 +-
 src/General/Navigate.coffee | 13 +++----------
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index dcf86e06d..558faa708 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -18807,15 +18807,10 @@
         return Navigate.parse(req.response.posts);
       } catch (_error) {
         err = _error;
-        console.error('Navigate failure:');
-        console.log(err);
-        if (notice) {
-          notice.setType('error');
-          notice.el.lastElementChild.textContent = 'Navigation Failed.';
-          setTimeout(notice.close, 2 * $.SECOND);
-        } else {
-          new Notice('error', 'Navigation Failed.', 2);
-        }
+        return Main.handleErrors({
+          message: "Navigate Failure.",
+          error: err
+        });
       }
     },
     makeBreadCrumb: function(href, view, boardID, threadID) {
@@ -20328,7 +20323,7 @@
     },
     parseError: function(data) {
       var error, message;
-      c.error(data.message, data.error.stack);
+      c.error(data.message, data.error.message, data.error.stack);
       message = $.el('div', {
         textContent: data.message
       });
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 68517b7ca..4fd9230f1 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -18833,15 +18833,10 @@
         return Navigate.parse(req.response.posts);
       } catch (_error) {
         err = _error;
-        console.error('Navigate failure:');
-        console.log(err);
-        if (notice) {
-          notice.setType('error');
-          notice.el.lastElementChild.textContent = 'Navigation Failed.';
-          setTimeout(notice.close, 2 * $.SECOND);
-        } else {
-          new Notice('error', 'Navigation Failed.', 2);
-        }
+        return Main.handleErrors({
+          message: "Navigate Failure.",
+          error: err
+        });
       }
     },
     makeBreadCrumb: function(href, view, boardID, threadID) {
@@ -20334,7 +20329,7 @@
     },
     parseError: function(data) {
       var error, message;
-      c.error(data.message, data.error.stack);
+      c.error(data.message, data.error.message, data.error.stack);
       message = $.el('div', {
         textContent: data.message
       });
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 0edc0e621..09cd1d835 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -241,7 +241,7 @@ Main =
     new Notice 'error', [div, logs], 30
 
   parseError: (data) ->
-    c.error data.message, data.error.stack
+    c.error data.message, data.error.message, data.error.stack
     message = $.el 'div',
       textContent: data.message
     error = $.el 'div',
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 58c8d4f9a..aa15cd808 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -304,16 +304,9 @@ Navigate =
     try
       Navigate.parse req.response.posts
     catch err
-      console.error 'Navigate failure:'
-      console.log err
-      # network error or non-JSON content for example.
-      if notice
-        notice.setType 'error'
-        notice.el.lastElementChild.textContent = 'Navigation Failed.'
-        setTimeout notice.close, 2 * $.SECOND
-      else
-        new Notice 'error', 'Navigation Failed.', 2
-      return
+      Main.handleErrors
+        message: "Navigate Failure."
+        error: err
 
   makeBreadCrumb: (href, view, boardID, threadID) ->
     breadCrumb = $.el 'span',