Commit 8d76c6a1 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'fabric-emptyStringViewOnly' into 'master'

fixed problem of empty string not displaying fabric image

See merge request !319
parents 8b933f7c ddedc2ac
Pipeline #5045 passed with stages
in 4 minutes and 3 seconds
...@@ -336,15 +336,15 @@ $(function (n) { ...@@ -336,15 +336,15 @@ $(function (n) {
that.userChangePossible = true; that.userChangePossible = true;
}); });
} else { } else {
if(!isReadOnly) { that.setBackground();
that.setBackground(); if(!isReadOnly) {
that.setBrush(); that.setBrush();
} }
that.canvas.renderAll(); that.canvas.renderAll();
that.userChangePossible = true; that.userChangePossible = true;
this.history.put(this.canvas.toJSON()); this.history.put(this.canvas.toJSON());
} }
var defaultColor = $fabricElement.data('fabric-color') || false; var defaultColor = this.parentElement.data('fabric-color') || false;
if (defaultColor) { if (defaultColor) {
this.setColor(defaultColor); this.setColor(defaultColor);
} }
......
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