Merge branch 'master' into feature/bombe

src/web/HTMLIngredient.mjs

@@ -32,6 +32,9 @@ class HTMLIngredient {
         this.defaultIndex = config.defaultIndex || 0;
         this.toggleValues = config.toggleValues;
         this.id = "ing-" + this.app.nextIngId();
+        this.min = (typeof config.min === "number") ? config.min : "";
+        this.max = (typeof config.max === "number") ? config.max : "";
+        this.step = config.step || 1;
     }
 
 
@@ -103,6 +106,9 @@ class HTMLIngredient {
                         id="${this.id}"
                         arg-name="${this.name}"
                         value="${this.value}"
+                        min="${this.min}"
+                        max="${this.max}"
+                        step="${this.step}"
                         ${this.disabled ? "disabled" : ""}>
                     ${this.hint ? "<span class='bmd-help'>" + this.hint + "</span>" : ""}
                 </div>`;

src/web/Manager.mjs

@@ -173,6 +173,7 @@ class Manager {
         this.addDynamicListener("#output-file-download", "click", this.output.downloadFile, this.output);
         this.addDynamicListener("#output-file-slice i", "click", this.output.displayFileSlice, this.output);
         document.getElementById("show-file-overlay").addEventListener("click", this.output.showFileOverlayClick.bind(this.output));
+        this.addDynamicListener(".extract-file,.extract-file i", "click", this.output.extractFileClick, this.output);
 
         // Options
         document.getElementById("options").addEventListener("click", this.options.optionsClick.bind(this.options));

src/web/OutputWaiter.mjs

@@ -524,6 +524,24 @@ class OutputWaiter {
         magicButton.setAttribute("data-original-title", "Magic!");
     }
 
+
+    /**
+     * Handler for extract file events.
+     *
+     * @param {Event} e
+     */
+    async extractFileClick(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        const el = e.target.nodeName === "I" ? e.target.parentNode : e.target;
+        const blobURL = el.getAttribute("blob-url");
+        const fileName = el.getAttribute("file-name");
+
+        const blob = await fetch(blobURL).then(r => r.blob());
+        this.manager.input.loadFile(new File([blob], fileName, {type: blob.type}));
+    }
+
 }
 
 export default OutputWaiter;

src/web/html/index.html

@@ -275,7 +275,7 @@
                                     <i class="material-icons">content_copy</i>
                                 </button>
                                 <button type="button" class="btn btn-primary bmd-btn-icon" id="switch" data-toggle="tooltip" title="Move output to input">
-                                    <i class="material-icons">loop</i>
+                                    <i class="material-icons">open_in_browser</i>
                                 </button>
                                 <button type="button" class="btn btn-primary bmd-btn-icon" id="undo-switch" data-toggle="tooltip" title="Undo" disabled="disabled">
                                     <i class="material-icons">undo</i>

src/web/stylesheets/components/_pane.css

@@ -91,3 +91,7 @@
     padding-right: 6px;
     padding-left: 6px;
 }
+
+#files .card-header .float-right a:hover {
+    text-decoration: none;
+}