Fixed download button (#21)

ValentinTyhonov · web-flow · commit 4b91e12e5598 · 2018-04-23T13:30:22.000+03:00
diff --git a/src/main/resources/static/js/downloadFile.js b/src/main/resources/static/js/downloadFile.js
@@ -0,0 +1,22 @@
+function downloadFile(data, type, title) {
+    if (window.navigator.msSaveOrOpenBlob) {
+        downloadFileMSExplorer(data, type, title);
+    } else {
+        downloadFileChromeFirefox(data, type, title);
+    }
+}
+
+function downloadFileChromeFirefox(data, type, title) {
+    var link = document.createElement('a');
+    document.body.appendChild(link);
+    link.setAttribute("href", "data:" + type + "," + encodeURIComponent(data));
+    link.setAttribute("download", title);
+    link.setAttribute("class", "hidden");
+    link.setAttribute("target", "_self");
+    link.click();
+}
+
+function downloadFileMSExplorer(data, type, title) {
+    var blob = new Blob([ data ], {type : type});
+    window.navigator.msSaveOrOpenBlob(blob, title);
+}
diff --git a/src/main/resources/static/js/subscription.js b/src/main/resources/static/js/subscription.js
@@ -409,13 +409,10 @@ jQuery(document).ready(function() {
         function getTemplate(){
             var req = new XMLHttpRequest();
             req.open("GET", '/download/subscriptiontemplate', true);
-            req.responseType = "blob";
+            req.responseType = "application/json;charset=utf-8";
             req.onload = function (event) {
-                var blob = req.response;
-                var link = document.createElement('a');
-                link.href = window.URL.createObjectURL(blob);
-                link.download = 'subscriptionsTemplate.json';
-                link.click();
+                var jsonData = JSON.stringify(JSON.parse(req.response), null, 2);
+                downloadFile(jsonData, "application/json;charset=utf-8", "subscriptionsTemplate.json");
             };
             req.send();}
         getTemplate();
diff --git a/src/main/resources/static/js/testrules.js b/src/main/resources/static/js/testrules.js
@@ -333,30 +333,8 @@ jQuery(document).ready(
           }
         });
         if (formRules.length !== 0) {
-          var contentType = "application/json;charset=utf-8";
           var jsonData = JSON.stringify(formRules, null, 2);
-          var fileName = "rules.json"
-
-          function downloadFile(data, type, title) {
-            var link = document.createElement('a');
-            link.setAttribute("href", "data:" + type + "," + encodeURIComponent(data));
-            link.setAttribute("download", fileName);
-            link.setAttribute("class", "hidden");
-            link.click();
-          }
-
-          function downloadFileMSExplorer(data, type, title) {
-            var blob = new Blob([ data ], {
-              type : type
-            });
-            window.navigator.msSaveOrOpenBlob(blob, title);
-          }
-
-          if (window.navigator.msSaveOrOpenBlob) {
-            downloadFileMSExplorer(jsonData, contentType, fileName);
-          } else {
-            downloadFile(jsonData, contentType, fileName);
-          }
+          downloadFile(jsonData, "application/json;charset=utf-8", "rules.json");
         } else {
           $.jGrowl("Data not available for download!", {
             sticky : false,
diff --git a/src/main/resources/templates/subscription.html b/src/main/resources/templates/subscription.html
@@ -240,6 +240,7 @@ <h3 class="modal-title text-center">Subscription Form</h3>
 -->
 
 <script type="text/javascript" src="js/subscription.js"></script>
+<script type="text/javascript" src="js/downloadFile.js"></script>
 
 </body>
 </html>
diff --git a/src/main/resources/templates/testRules.html b/src/main/resources/templates/testRules.html
@@ -7,6 +7,7 @@
 <meta name="description" content="" />
 <meta name="author" content="" />
 <script type="text/javascript" src="js/testrules.js"></script>
+<script type="text/javascript" src="js/downloadFile.js"></script>
 </head>
 <body>
     <div class="hidden" id="frontendServiceUrl" style="display: none" th:text="${frontendServiceUrl}"></div>
