Commit 2d65750b authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/master'

parents 8fd30265 58f97eb4
Pipeline #2086 passed with stages
in 2 minutes and 51 seconds
before_script:
- VERSION=`cat ./version`
- RELDATE=`date '+%Y%m%d%H%M'`
- mkdir build || true
variables:
......@@ -28,6 +29,7 @@ snapshot:
script:
- make VERSION=$VERSION phpunit_snapshot
- chmod a+r qfq_$VERSION_*.zip
- mv qfq_$VERSION_*.zip qfq_${VERSION}_${RELDATE}-${CI_BUILD_REF_NAME}.zip
- scp qfq_$VERSION_*.zip w16:qfq/snapshots/
- mv qfq_$VERSION_*.zip build/qfq.zip
......
......@@ -282,6 +282,9 @@ $(function (n) {
var that = this;
if (viewOnly) {
if (inputField) {
this.outputField = $("#" + inputField);
}
this.getMeta(this.backgroundImage, function(width, height) { that.prepareStaticCanvas(width, height); } );
} else if (editImage) {
this.outputField = $("#" + inputField);
......@@ -400,9 +403,16 @@ $(function (n) {
console.log("prepareStaticCanvas");
var that = this;
this.generateStaticCanvas(width, height);
if (this.fabricJSON) {
this.canvas.loadFromJSON(this.fabricJSON, function() {
that.resizeCanvas(true);
if (this.outputField.val()) {
fabricJSON = this.outputField.val();
} else if (this.fabricJSON) {
fabricJSON = this.fabricJSON;
}
if (fabricJSON) {
this.canvas.loadFromJSON(fabricJSON, function() {
that.firstLoad = true;
that.setBackground();
that.resizeCanvas();
that.canvas.renderAll();
});
} else {
......
Markdown is supported
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