Merge branch 'master' into zach-starter

1 files changed, 7 insertions, 11 deletions

diff --git a/src/client/views/nodes/WebBoxRenderer.js b/src/client/views/nodes/WebBoxRenderer.js
index 6fb8f4957..b727107a9 100644
--- a/src/client/views/nodes/WebBoxRenderer.js
+++ b/src/client/views/nodes/WebBoxRenderer.js
@@ -4,8 +4,6 @@
  * @param {StyleSheetList} styleSheets
  */
 const ForeignHtmlRenderer = function (styleSheets) {
-    const self = this;
-
     /**
      *
      * @param {String} binStr
@@ -252,15 +250,14 @@ const ForeignHtmlRenderer = function (styleSheets) {
      */
     this.renderToImage = (webUrl, html, width, height, scroll, xoff) =>
         new Promise(resolve => {
-            const img = new Image();
-            img.onload = function () {
-                console.log(`IMAGE SVG created: ${webUrl}`);
-                resolve(img);
-            };
             console.log(`BUILDING SVG for: ${webUrl}`);
             buildSvgDataUri(webUrl, html, width, height, scroll, xoff).then(uri => {
+                const img = new Image();
                 img.src = uri;
-                return img;
+                img.onload = () => {
+                    console.log(`IMAGE SVG created: ${webUrl}`);
+                    resolve(img);
+                };
             });
         });
 
@@ -272,7 +269,7 @@ const ForeignHtmlRenderer = function (styleSheets) {
      * @return {Promise<Image>}
      */
     this.renderToCanvas = (webUrl, html, width, height, scroll, xoff, oversample) =>
-        self.renderToImage(webUrl, html, width, height, scroll, xoff).then(img => {
+        this.renderToImage(webUrl, html, width, height, scroll, xoff).then(img => {
             const canvas = document.createElement('canvas');
             canvas.width = img.width * oversample;
             canvas.height = img.height * oversample;
@@ -290,8 +287,7 @@ const ForeignHtmlRenderer = function (styleSheets) {
      * @return {Promise<String>}
      */
     this.renderToBase64Png = (webUrl, html, width, height, scroll, xoff, oversample) =>
-        self
-            .renderToCanvas(webUrl, html, width, height, scroll, xoff, oversample) //
+        this.renderToCanvas(webUrl, html, width, height, scroll, xoff, oversample) //
             .then(canvas => canvas.toDataURL('image/png'));
 };