Add an error handler

99496af5 · Jérome Perrin · b0ae764c · 99496af5 · 99496af5
Commit 99496af5 authored Jul 25, 2014 by Jérome Perrin
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 1 deletion

dream/platform/src/dream/index.html dream/platform/src/dream/index.html +7 -0

dream/platform/src/dream/index.js dream/platform/src/dream/index.js +12 -1

No files found.
--- a/dream/platform/src/dream/index.html
+++ b/dream/platform/src/dream/index.html
@@ -34,6 +34,13 @@
      <li><a href="{{link}}">{{title}}</a></li>
    </script>

+    <script id="error-template" type="text/x-handlebars-template">
+      <h1>An Error Has Occurred</h1>
+      <a href="javascript: location.reload()">Click here to reload the page</a><br/>
+      The error detail is:
+      <pre>{{error}}</pre>
+    </script>
+
  </head>
  <body>


--- a/dream/platform/src/dream/index.js
+++ b/dream/platform/src/dream/index.js
-/*global jQuery, rJS, RSVP, alert, Handlebars, initGadgetMixin */
+/*global console, jQuery, rJS, RSVP, alert, Handlebars, initGadgetMixin */
 /*jslint nomen: true */
 (function (window, $, rJS, RSVP, Handlebars, initGadgetMixin) {
  "use strict";
@@ -155,6 +155,7 @@
    panel_template,
    navigation_template,
    active_navigation_template,
+    error_template,
    gadget_klass = rJS(window);

  function calculateTabHTML(gadget, options, key, title, active) {
@@ -399,6 +400,9 @@
        active_navigation_template = Handlebars.compile(
          document.getElementById("active-navigation-template").innerHTML
        );
+        error_template = Handlebars.compile(
+          document.getElementById("error-template").innerHTML
+        );
      }
    })

@@ -537,6 +541,13 @@
          if (page_gadget.startService !== undefined) {
            return page_gadget.startService();
          }
+        }).push(undefined, function (error) {
+          if (error instanceof RSVP.CancellationError) {
+            throw error;
+          }
+          console.error(error);
+          document.querySelector("article[class='gadget_container']")
+            .innerHTML = error_template({ error: error });
        });
    });
 }(window, jQuery, rJS, RSVP, Handlebars, initGadgetMixin));