Commit 05baaa54 authored by bbaer's avatar bbaer
Browse files

static canvas did load background image from json even if supplied otherwise

parent 668750e7
......@@ -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();
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment