From 05baaa54b32f2785a1f1072bc931e8eecd7fefd0 Mon Sep 17 00:00:00 2001 From: bbaer <bbaer@math.uzh.ch> Date: Thu, 1 Mar 2018 14:12:02 +0100 Subject: [PATCH] static canvas did load background image from json even if supplied otherwise --- javascript/src/Plugins/qfq.fabric.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/javascript/src/Plugins/qfq.fabric.js b/javascript/src/Plugins/qfq.fabric.js index 86ff5cdd5..7d6df513a 100644 --- a/javascript/src/Plugins/qfq.fabric.js +++ b/javascript/src/Plugins/qfq.fabric.js @@ -233,10 +233,8 @@ $(function (n) { }); $emojiField.append($img); $img.on("dragstart", function() { - console.log(o.name + " mouseDown"); that.qFabric.dragAndDrop = true; that.qFabric.dndData = o.url; - $("window").mousedown(); }); }) }; @@ -358,7 +356,7 @@ $(function (n) { this.generateStaticCanvas(width, height); if (this.fabricJSON) { this.canvas.loadFromJSON(this.fabricJSON, function() { - that.canvas.renderAll(); + that.setBackground(); that.resizeCanvas(); that.canvas.renderAll(); }); -- GitLab