From 4588cd151c96e6228097c3c1246609fcaabf1797 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Sat, 6 Jan 2018 15:29:58 +0000 Subject: [PATCH 1/3] Data pasted into the input is treat as a file if it's over the IO threshold --- src/core/Chef.js | 2 +- src/web/InputWaiter.js | 55 +++++++++++++++++++++++++++++++++++------ src/web/Manager.js | 3 ++- src/web/html/index.html | 4 +-- src/web/index.js | 2 +- 5 files changed, 54 insertions(+), 12 deletions(-) diff --git a/src/core/Chef.js b/src/core/Chef.js index 0d71ce2e..3c1370ce 100755 --- a/src/core/Chef.js +++ b/src/core/Chef.js @@ -80,7 +80,7 @@ Chef.prototype.bake = async function(input, recipeConfig, options, progress, ste // Depending on the size of the output, we may send it back as a string or an ArrayBuffer. // This can prevent unnecessary casting as an ArrayBuffer can be easily downloaded as a file. // The threshold is specified in KiB. - const threshold = (options.outputFileThreshold || 1024) * 1024; + const threshold = (options.ioDisplayThreshold || 1024) * 1024; const returnType = this.dish.size() > threshold ? Dish.ARRAY_BUFFER : Dish.STRING; return { diff --git a/src/web/InputWaiter.js b/src/web/InputWaiter.js index e39e06fd..2fb6d7df 100755 --- a/src/web/InputWaiter.js +++ b/src/web/InputWaiter.js @@ -61,9 +61,13 @@ InputWaiter.prototype.set = function(input) { if (input instanceof File) { this.setFile(input); inputText.value = ""; + this.setInputInfo(input.size, null); } else { inputText.value = input; window.dispatchEvent(this.manager.statechange); + const lines = input.length < (this.app.options.ioDisplayThreshold * 1024) ? + input.count("\n") + 1 : null; + this.setInputInfo(input.length, lines); } }; @@ -81,6 +85,7 @@ InputWaiter.prototype.setFile = function(file) { fileType = document.getElementById("input-file-type"), fileLoaded = document.getElementById("input-file-loaded"); + this.fileBuffer = new ArrayBuffer(); fileOverlay.style.display = "block"; fileName.textContent = file.name; fileSize.textContent = file.size.toLocaleString() + " bytes"; @@ -100,21 +105,28 @@ InputWaiter.prototype.setInputInfo = function(length, lines) { width = width < 2 ? 2 : width; const lengthStr = length.toString().padStart(width, " ").replace(/ /g, " "); - const linesStr = lines.toString().padStart(width, " ").replace(/ /g, " "); + let msg = "length: " + lengthStr; - document.getElementById("input-info").innerHTML = "length: " + lengthStr + "
lines: " + linesStr; + if (typeof lines === "number") { + const linesStr = lines.toString().padStart(width, " ").replace(/ /g, " "); + msg += "
lines: " + linesStr; + } + + document.getElementById("input-info").innerHTML = msg; }; /** - * Handler for input scroll events. - * Scrolls the highlighter pane to match the input textarea position and updates history state. + * Handler for input change events. * * @param {event} e * * @fires Manager#statechange */ InputWaiter.prototype.inputChange = function(e) { + // Ignore this function if the input is a File + if (this.fileBuffer) return; + // Remove highlighting from input and output panes as the offsets might be different now this.manager.highlighter.removeHighlights(); @@ -123,18 +135,47 @@ InputWaiter.prototype.inputChange = function(e) { // Update the input metadata info const inputText = this.get(); - const lines = inputText.count("\n") + 1; + const lines = inputText.length < (this.app.options.ioDisplayThreshold * 1024) ? + inputText.count("\n") + 1 : null; this.setInputInfo(inputText.length, lines); - - if (this.badKeys.indexOf(e.keyCode) < 0) { + if (e && this.badKeys.indexOf(e.keyCode) < 0) { // Fire the statechange event as the input has been modified window.dispatchEvent(this.manager.statechange); } }; +/** + * Handler for input paste events. + * Checks that the size of the input is below the display limit, otherwise treats it as a file/blob. + * + * @param {event} e + */ +InputWaiter.prototype.inputPaste = function(e) { + const pastedData = e.clipboardData.getData("Text"); + + if (pastedData.length < (this.app.options.ioDisplayThreshold * 1024)) { + this.inputChange(e); + } else { + e.preventDefault(); + e.stopPropagation(); + + const file = new File([pastedData], "PastedData", { + type: "text/plain", + lastModified: Date.now() + }); + + this.loaderWorker = new LoaderWorker(); + this.loaderWorker.addEventListener("message", this.handleLoaderMessage.bind(this)); + this.loaderWorker.postMessage({"file": file}); + this.set(file); + return false; + } +}; + + /** * Handler for input dragover events. * Gives the user a visual cue to show that items can be dropped here. diff --git a/src/web/Manager.js b/src/web/Manager.js index bf3f4acd..878077c1 100755 --- a/src/web/Manager.js +++ b/src/web/Manager.js @@ -132,7 +132,8 @@ Manager.prototype.initialiseEventListeners = function() { this.addDynamicListener("#rec-list", "operationremove", this.recipe.opRemove.bind(this.recipe)); // Input - this.addMultiEventListener("#input-text", "keyup paste", this.input.inputChange, this.input); + this.addMultiEventListener("#input-text", "keyup", this.input.inputChange, this.input); + this.addMultiEventListener("#input-text", "paste", this.input.inputPaste, this.input); document.getElementById("reset-layout").addEventListener("click", this.app.resetLayout.bind(this.app)); document.getElementById("clr-io").addEventListener("click", this.input.clearIoClick.bind(this.input)); this.addListeners("#input-text,#input-file", "dragover", this.input.inputDragover, this.input); diff --git a/src/web/html/index.html b/src/web/html/index.html index 5e522ed8..dfe586cd 100755 --- a/src/web/html/index.html +++ b/src/web/html/index.html @@ -372,8 +372,8 @@
- - + +
- +