From a943b6de6d5b782cd814b1a34d293ba1ec3eaca4 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Wed, 16 Oct 2019 14:07:19 +0200
Subject: [PATCH] Fix download of dmn
---
.../main/resources/META-INF/resources/index.html | 3 +--
.../resources/META-INF/resources/js/dmnDownload.js | 14 --------------
.../js/{dmnUpload.js => dmnUpDownload.js} | 12 +++++++++++-
3 files changed, 12 insertions(+), 17 deletions(-)
delete mode 100644 dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnDownload.js
rename dmnverifierfrontend/src/main/resources/META-INF/resources/js/{dmnUpload.js => dmnUpDownload.js} (64%)
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/index.html b/dmnverifierfrontend/src/main/resources/META-INF/resources/index.html
index 3044c807..18b8d8e3 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/index.html
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/index.html
@@ -52,8 +52,7 @@
<!-- load dmn modeler -->
<script src="https://unpkg.com/dmn-js@7.0.1/dist/dmn-modeler.development.js"></script>
-<script src="js/dmnUpload.js" type="text/javascript"></script>
-<script src="js/dmnDownload.js" type="text/javascript"></script>
+<script src="js/dmnUpDownload.js" type="text/javascript"></script>
<script src="js/dmnViewer.js" type="text/javascript"></script>
<script src="js/dmnVerifier.js" type="text/javascript"></script>
</body>
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnDownload.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnDownload.js
deleted file mode 100644
index 7b627084..00000000
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnDownload.js
+++ /dev/null
@@ -1,14 +0,0 @@
-document.addEventListener("DOMContentLoaded", function () {
- $('#dmn-file-download').on('click', exportDiagram());
-});
-
-function download(filename, dmnXml) {
- let el = document.createElement('a');
- el.setAttribute('href',
- 'data:text/xml;charset=utf-8,' + encodeURIComponent(dmnXml));
- el.setAttribute('download', filename);
- el.style.display = 'none';
- document.body.appendChild(el);
- el.click();
- document.body.removeChild(el);
-}
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpload.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpDownload.js
similarity index 64%
rename from dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpload.js
rename to dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpDownload.js
index 7de06eb1..9bc2b55d 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpload.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpDownload.js
@@ -1,6 +1,7 @@
document.addEventListener("DOMContentLoaded", function () {
$('#dmn-file-upload').on('change', loadDmnFromFile);
$('#dmn-file-empty').on('click', loadEmptyFile);
+ $('#dmn-file-download').on('click', exportDiagram);
});
function loadDmnFromFile(evt) {
@@ -25,4 +26,13 @@ function loadEmptyFile() {
});
}
-
+function download(filename, dmnXml) {
+ let el = document.createElement('a');
+ el.setAttribute('href',
+ 'data:text/xml;charset=utf-8,' + encodeURIComponent(dmnXml));
+ el.setAttribute('download', filename);
+ el.style.display = 'none';
+ document.body.appendChild(el);
+ el.click();
+ document.body.removeChild(el);
+}
--
GitLab