Bläddra i källkod

Added option to turn off background auto magic

n1474335 7 år sedan
förälder
incheckning
a947e06140

+ 2 - 0
src/web/OutputWaiter.mjs

@@ -423,6 +423,8 @@ class OutputWaiter {
      */
      */
     backgroundMagic() {
     backgroundMagic() {
         this.hideMagicButton();
         this.hideMagicButton();
+        if (!this.app.options.autoMagic) return;
+
         const sample = this.dishStr ? this.dishStr.slice(0, 1000) :
         const sample = this.dishStr ? this.dishStr.slice(0, 1000) :
             this.dishBuffer ? this.dishBuffer.slice(0, 1000) : "";
             this.dishBuffer ? this.dishBuffer.slice(0, 1000) : "";
 
 

+ 8 - 1
src/web/html/index.html

@@ -285,7 +285,7 @@
                             </button>
                             </button>
                             <span id="stale-indicator" class="hidden" data-toggle="tooltip" title="The output is stale. The input or recipe has changed since this output was generated. Bake again to get the new value.">
                             <span id="stale-indicator" class="hidden" data-toggle="tooltip" title="The output is stale. The input or recipe has changed since this output was generated. Bake again to get the new value.">
                                 <i class="material-icons">access_time</i>
                                 <i class="material-icons">access_time</i>
-                            </span> 
+                            </span>
                         </div>
                         </div>
                         <div class="textarea-wrapper">
                         <div class="textarea-wrapper">
                             <div id="output-highlighter" class="no-select"></div>
                             <div id="output-highlighter" class="no-select"></div>
@@ -492,6 +492,13 @@
                                 Use meta key for keybindings (Windows ⊞/Command ⌘)
                                 Use meta key for keybindings (Windows ⊞/Command ⌘)
                             </label>
                             </label>
                         </div>
                         </div>
+
+                        <div class="checkbox option-item">
+                            <label for="autoMagic">
+                                <input type="checkbox" option="autoMagic" id="autoMagic">
+                                Attempt to detect encoded data automagically
+                            </label>
+                        </div>
                     </div>
                     </div>
                     <div class="modal-footer">
                     <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" id="reset-options">Reset options to default</button>
                         <button type="button" class="btn btn-secondary" id="reset-options">Reset options to default</button>

+ 2 - 1
src/web/index.js

@@ -51,7 +51,8 @@ function main() {
         theme:               "classic",
         theme:               "classic",
         useMetaKey:          false,
         useMetaKey:          false,
         ioDisplayThreshold:  512,
         ioDisplayThreshold:  512,
-        logLevel:            "info"
+        logLevel:            "info",
+        autoMagic:           true,
     };
     };
 
 
     document.removeEventListener("DOMContentLoaded", main, false);
     document.removeEventListener("DOMContentLoaded", main, false);

+ 1 - 1
src/web/stylesheets/utils/_overrides.css

@@ -165,7 +165,7 @@ optgroup {
 }
 }
 
 
 .nav-tabs .nav-link {
 .nav-tabs .nav-link {
-    color: var(--subtext-font-color);
+    color: var(--subtext-font-colour);
 }
 }
 
 
 .nav-tabs>li>a.nav-link.active, .nav-tabs>li>a.nav-link.active:focus, .nav-tabs>li>a.nav-link.active:hover {
 .nav-tabs>li>a.nav-link.active, .nav-tabs>li>a.nav-link.active:focus, .nav-tabs>li>a.nav-link.active:hover {