Merge pull request #266 from mixonic/safe-website

Catch, display and log rendering errors
bustle · Dec 14, 2015 · 4af6d90 · 4af6d90
2 parents 69e7394 + ce06ef3
commit 4af6d90
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/demo/app/components/mobiledoc-dom-renderer.js b/demo/app/components/mobiledoc-dom-renderer.js
@@ -2,8 +2,6 @@ import Ember from 'ember';
 import cards from '../mobiledoc-cards/dom';
 import Renderer from 'ember-mobiledoc-dom-renderer';
 
-let { run } = Ember;
-
 let renderer = new Renderer({cards});
 
 export default Ember.Component.extend({
@@ -13,16 +11,21 @@ export default Ember.Component.extend({
       return;
     }
 
-    run(() => {
-      if (this._teardownRender) {
-        this._teardownRender();
-        this._teardownRender = null;
-      }
+    if (this._teardownRender) {
+      this._teardownRender();
+      this._teardownRender = null;
+    }
 
-      let target = this.$();
+    let target = this.$();
+    target.empty();
+    try {
       let { result, teardown } = renderer.render(mobiledoc);
       target.append(result);
       this._teardownRender = teardown;
-    });
+    } catch(e) {
+      console.error(e);
+      let result = document.createTextNode(e.message);
+      target.append(result);
+    }
   }
 });
diff --git a/demo/app/components/mobiledoc-html-renderer.js b/demo/app/components/mobiledoc-html-renderer.js
@@ -2,8 +2,6 @@ import Ember from 'ember';
 import cards from '../mobiledoc-cards/html';
 import Renderer from 'ember-mobiledoc-html-renderer';
 
-let { run } = Ember;
-
 let renderer = new Renderer({cards});
 
 export default Ember.Component.extend({
@@ -13,10 +11,15 @@ export default Ember.Component.extend({
       return;
     }
 
-    run(() => {
-      let target = this.$();
+    let target = this.$();
+    target.empty();
+    try {
       let { result: html } = renderer.render(mobiledoc);
       target.text(html);
-    });
+    } catch (e) {
+      console.error(e);
+      let result = document.createTextNode(e.message);
+      target.append(result);
+    }
   }
 });
diff --git a/demo/app/components/mobiledoc-text-renderer.js b/demo/app/components/mobiledoc-text-renderer.js
@@ -2,8 +2,6 @@ import Ember from 'ember';
 import cards from '../mobiledoc-cards/text';
 import Renderer from 'ember-mobiledoc-text-renderer';
 
-let { run } = Ember;
-
 let renderer = new Renderer({cards});
 
 let addHTMLEntitites = (str) => {
@@ -18,19 +16,24 @@ export default Ember.Component.extend({
     if (!mobiledoc) {
       return;
     }
-    run(() => {
-      if (this._teardownRender) {
-        this._teardownRender();
-        this._teardownRender = null;
-      }
+    if (this._teardownRender) {
+      this._teardownRender();
+      this._teardownRender = null;
+    }
 
-      let target = this.$();
+    let target = this.$();
+    target.empty();
+    try {
       let {result: text, teardown} = renderer.render(mobiledoc);
 
       text = addHTMLEntitites(text);
       target.html(text);
 
       this._teardownRender = teardown;
-    });
+    } catch(e) {
+      console.error(e);
+      let result = document.createTextNode(e.message);
+      target.append(result);
+    }
   }
 });