From 0584fdf8398636d4098a267beda121fe50ea90d0 Mon Sep 17 00:00:00 2001
From: bbaer <bbaer@math.uzh.ch>
Date: Fri, 5 Jan 2018 18:35:04 +0100
Subject: [PATCH] fixed a rotate edit, exportImage Button
---
javascript/src/Plugins/qfq.fabric.js | 2 +-
mockup/imageEditorFabric.html | 3 +++
mockup/mockData/fabric.editor.buttons.json | 10 ++++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/javascript/src/Plugins/qfq.fabric.js b/javascript/src/Plugins/qfq.fabric.js
index 0b8999538..dc410a97a 100644
--- a/javascript/src/Plugins/qfq.fabric.js
+++ b/javascript/src/Plugins/qfq.fabric.js
@@ -818,8 +818,8 @@ $(function (n) {
img.width = this.canvas.width;
}
if (img.height < this.canvas.height) {
- this.canvas.height = this.originalHeight;
img.width = this.canvas.height * img.height / img.width;
+ img.height = this.canvas.height;
}
}
this.canvas.centerObject(img);
diff --git a/mockup/imageEditorFabric.html b/mockup/imageEditorFabric.html
index 801e2e398..1f1fdce6a 100644
--- a/mockup/imageEditorFabric.html
+++ b/mockup/imageEditorFabric.html
@@ -44,6 +44,9 @@
data-background-image="mockData/Scan2a.jpeg">
</div>
</div>
+ <div class="col-md-8">
+ <img id="target-png">
+ </div>
</div>
</div>
diff --git a/mockup/mockData/fabric.editor.buttons.json b/mockup/mockData/fabric.editor.buttons.json
index 8f92fe5d4..65dcad700 100644
--- a/mockup/mockData/fabric.editor.buttons.json
+++ b/mockup/mockData/fabric.editor.buttons.json
@@ -10,6 +10,16 @@
"hasToggleElement": false,
"toggleElement": "",
"icon": "glyphicon-repeat"
+ }, {
+ "name": "exportImage",
+ "selector": "export-img",
+ "requiresDrawing": false,
+ "requiresSelection": false,
+ "isToggle": false,
+ "toggle": "",
+ "hasToggleElement": false,
+ "toggleElement": "",
+ "icon": "glyphicon-floppy-disk"
}
],
"currentMode": ""
--
GitLab