diff --git a/app/static/app/js/Console.jsx b/app/static/app/js/Console.jsx
index c3911c93..0c3e77c0 100644
--- a/app/static/app/js/Console.jsx
+++ b/app/static/app/js/Console.jsx
@@ -26,7 +26,6 @@ class Console extends React.Component {
this.handleMouseOver = this.handleMouseOver.bind(this);
this.handleMouseOut = this.handleMouseOut.bind(this);
this.downloadTxt = this.downloadTxt.bind(this);
- this.copyTxt = this.copyTxt.bind(this);
this.enterFullscreen = this.enterFullscreen.bind(this);
this.exitFullscreen = this.exitFullscreen.bind(this);
}
@@ -69,17 +68,7 @@ class Console extends React.Component {
}
downloadTxt(filename="console.txt"){
- Utils.saveAs(this.state.lines.join("\r\n"), filename);
- }
-
- copyTxt(){
- const el = document.createElement('textarea');
- el.value = this.state.lines.join("\r\n");
- document.body.appendChild(el);
- el.select();
- document.execCommand('copy');
- document.body.removeChild(el);
- console.log("Output copied to clipboard");
+ Utils.saveAs(this.state.lines.join("\n"), filename);
}
enterFullscreen(){
@@ -172,9 +161,6 @@ class Console extends React.Component {
this.downloadTxt()} className="btn btn-sm btn-primary" title="Download To File">
-
-
-
diff --git a/app/static/app/js/classes/Utils.js b/app/static/app/js/classes/Utils.js
index 7d1f6940..31e040fb 100644
--- a/app/static/app/js/classes/Utils.js
+++ b/app/static/app/js/classes/Utils.js
@@ -1,3 +1,5 @@
+const FileSaver = require('file-saver');
+
let escapeEntityMap = {
"&": "&",
"<": "<",
@@ -83,26 +85,8 @@ export default {
},
saveAs: function(text, filename){
- function save(uri, filename) {
- let link = document.createElement('a');
- if (typeof link.download === 'string') {
- link.href = uri;
- link.download = filename;
-
- //Firefox requires the link to be in the body
- document.body.appendChild(link);
-
- //simulate click
- link.click();
-
- //remove the link when done
- document.body.removeChild(link);
- } else {
- window.open(uri);
- }
- }
-
- save("data:application/octet-stream," + encodeURIComponent(text), filename);
+ var blob = new Blob([text], {type: "text/plain;charset=utf-8"});
+ FileSaver.saveAs(blob, filename);
}
};
diff --git a/package.json b/package.json
index fc359b2a..f70c2f1a 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"fbemitter": "^2.1.1",
"file-loader": "^0.9.0",
+ "file-saver": "^2.0.2",
"gl-matrix": "^2.3.2",
"history": "^4.7.2",
"immutability-helper": "^2.0.0",
diff --git a/webodm/settings.py b/webodm/settings.py
index 69d41e0c..855d513b 100644
--- a/webodm/settings.py
+++ b/webodm/settings.py
@@ -182,6 +182,7 @@ STATICFILES_FINDERS = [
# File Uploads
FILE_UPLOAD_MAX_MEMORY_SIZE = 4718592 # 4.5 MB
+DATA_UPLOAD_MAX_MEMORY_SIZE = 10485760 # 10 MB
DATA_UPLOAD_MAX_NUMBER_FIELDS = None
FILE_UPLOAD_HANDLERS = [