Merge pull request #21 from TheOtterlord/fix-combowidget

Fix combowidget

Author: TheOtterlord

CHANGELOG.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## 0.8.1 Alpha
+
+The combo widget hover/preview has been removed as it is incompatible with the new card preview.
+I plan to reimplement this when I revisit the combo system.
+
+### Removed
+
+- Combo Widget Preview
+
 ## 0.8.0 Alpha
 
 ### Added

index.html

@@ -321,7 +321,8 @@ <h2 style="padding: 4px;">Filter</h2>
           <br><br>
         </div>
       </div>
-      <button class="ir-button ir-maxwidth" style="background: var(--background);" onclick="toggleFilter(`close`)">Close</button>
+      <button class="ir-button ir-maxwidth" style="background: var(--background);"
+        onclick="toggleFilter(`close`)">Close</button>
     </div>
   </div>
 
@@ -343,7 +344,8 @@ <h2 class="collapse-btn" onclick="toggleCollapse(this)">Arrays</h2>
         <div class="collapse" style="padding:0;">
           <div id="arrays"></div>
           <div class="ir-margin">
-            <input class="ir-input ir-maxwidth" id="array-name" placeholder="Name of array" onkeypress="if (event.which == 13) combo_editor.addArray();" spellcheck="false">
+            <input class="ir-input ir-maxwidth" id="array-name" placeholder="Name of array"
+              onkeypress="if (event.which == 13) combo_editor.addArray();" spellcheck="false">
             <button class="ir-button ir-maxwidth" onclick="combo_editor.addArray()">+ Add array</button>
           </div>
         </div>
@@ -361,7 +363,8 @@ <h2 class="collapse-btn" onclick="toggleCollapse(this)">Combos</h2>
         <div class="ir-margin">
           <h6 style="margin:0;color:#f44;">
             This feature is experimental.
-            Please report any bugs and send your feedback to <a style="color:#68f" href="https://github.com/TheOtterlord/deckmaster/issues">GitHub</a>.
+            Please report any bugs and send your feedback to <a style="color:#68f"
+              href="https://github.com/TheOtterlord/deckmaster/issues">GitHub</a>.
           </h6>
         </div>
       </div>
@@ -370,8 +373,12 @@ <h6 style="margin:0;color:#f44;">
       <div class="col" style="width: 25%;">
         <div class="ir-margin">
           <h6 style="margin:0;color:#888;">Changes will be reflected on save</h6>
-          <input class="ir-input ir-maxwidth" id="combo-name" placeholder="Combo Name" oninput="combo_editor.data.combos[combo_editor.currentCombo].name = this.value" spellcheck="false">
-          <textarea style="font-family: sans-serif;resize: vertical;height: 200px;" class="ir-input ir-maxwidth" id="combo-desc" placeholder="Combo Description" oninput="combo_editor.data.combos[combo_editor.currentCombo].desc = this.value" spellcheck="false"></textarea>
+          <input class="ir-input ir-maxwidth" id="combo-name" placeholder="Combo Name"
+            oninput="combo_editor.data.combos[combo_editor.currentCombo].name = this.value" spellcheck="false">
+          <textarea style="font-family: sans-serif;resize: vertical;height: 200px;" class="ir-input ir-maxwidth"
+            id="combo-desc" placeholder="Combo Description"
+            oninput="combo_editor.data.combos[combo_editor.currentCombo].desc = this.value"
+            spellcheck="false"></textarea>
           <select id="combo-turn" onchange="combo_editor.data.combos[combo_editor.currentCombo].turn = this.value;">
             <option value="first">First</option>
             <option value="second">Second</option>
@@ -387,12 +394,16 @@ <h6 style="margin:0;color:#888;">Changes will be reflected on save</h6>
           <div id="variant-tests" class="array-list"></div>
           <div style="position: relative;">
             <div class="suggestions"></div>
-            <input class="ir-input ir-maxwidth" id="variant-query" oninput="suggest(this);combo_editor.validateTestQuery();inputPreview(this)" placeholder="YCB Query" spellcheck="false">
+            <input class="ir-input ir-maxwidth" id="variant-query"
+              oninput="suggest(this);combo_editor.validateTestQuery();inputPreview(this)" placeholder="YCB Query"
+              spellcheck="false">
           </div>
           <h6 class="ir-hint-text" style="margin-bottom:6px;"></h6>
           <div class="ir-flex-row">
-            <input class="ir-flex ir-input" style="margin:2px;float:left;width:50%" id="variant-min" onkeyup="" placeholder="Min" type="number" min="0">
-            <input class="ir-flex ir-input" style="margin:2px;float:left;width:50%" id="variant-max" onkeyup="" placeholder="Max" type="number" min="0">
+            <input class="ir-flex ir-input" style="margin:2px;float:left;width:50%" id="variant-min" onkeyup=""
+              placeholder="Min" type="number" min="0">
+            <input class="ir-flex ir-input" style="margin:2px;float:left;width:50%" id="variant-max" onkeyup=""
+              placeholder="Max" type="number" min="0">
           </div>
           <br>
           <select id="variant-target">
@@ -417,7 +428,9 @@ <h2 style="color:#666">arrays.<span style="color:#fff" id="display-array-name"><
         <br>
         <div style="position:relative;">
           <div class="suggestions"></div>
-          <input class="ir-input ir-maxwidth" id="array-itemname" oninput="suggest(this)" onkeyup="if (event.which == 13) combo_editor.addArrayItem();else {combo_editor.validateArrayItem();inputPreview(this)}" placeholder="YCB Query" spellcheck="false">
+          <input class="ir-input ir-maxwidth" id="array-itemname" oninput="suggest(this)"
+            onkeyup="if (event.which == 13) combo_editor.addArrayItem();else {combo_editor.validateArrayItem();inputPreview(this)}"
+            placeholder="YCB Query" spellcheck="false">
         </div>
         <h6 class="ir-hint-text"></h6>
         <button class="ir-button ir-maxwidth" onclick="combo_editor.addArrayItem()">Add Item</button>
@@ -447,7 +460,8 @@ <h6 class="ir-hint-text"></h6>
         </select>
       </div>
       <div class="ir-flex-row">
-        <textarea class="ir-input ir-maxwidth user_css" style="font-family: sans-serif;resize: vertical;height: 200px;" placeholder="Add custom CSS..." spellcheck="false" oninput="setCSS(this.value)"></textarea>
+        <textarea class="ir-input ir-maxwidth user_css" style="font-family: sans-serif;resize: vertical;height: 200px;"
+          placeholder="Add custom CSS..." spellcheck="false" oninput="setCSS(this.value)"></textarea>
       </div>
     </div>
     <div class="tab" id="Keybindings">
@@ -487,7 +501,7 @@ <h6 class="ir-hint-text"></h6>
     </div>
     <div class="tab" id="About">
       <h2>About</h2>
-      <p>Version: 0.8.0</p>
+      <p>Version: 0.8.1</p>
       <p>Author: Reuben Tier (AKA TheOtterlord)</p>
       <p>Website: <a href="https://theotterlord.github.io/deckmaster"
           target="_blank">https://theotterlord.github.io/deckmaster</a></p>
@@ -521,21 +535,14 @@ <h2>Welcome</h2>
   <div class="changelog" style="padding: 16px;">
     <h2>What's new in <span class="version"></span></h2>
     <div>
-      <p>This update improves the overall UI adding themes &amp; custom css while also adding autocomplete for YCB card ids.</p>
-      <h3 id="added">Added</h3>
+      <p>The combo widget hover/preview has been removed as it is incompatible with the new card preview.
+        I plan to reimplement this when I revisit the combo system.</p>
+      <h3 id="removed">Removed</h3>
       <ul>
-      <li>A theme system with a few different themes</li>
-      <li>Custom css that can be changed in settings</li>
-      <li>Autocomplete for YCB card ids</li>
-      <li>Discord connect &amp; disconnect notifications</li>
-      <li>New notifications API with better animations</li>
+        <li>Combo Widget Preview</li>
       </ul>
-      <h3 id="changed">Changed</h3>
-      <ul>
-      <li>Upgraded electron to 11.2.1 minimum</li>
-      <li>Updated the start screen UI (now only displays the name of the file, not the path)</li>
-      </ul>
-      <p><a href="https://github.com/TheOtterlord/deckmaster/blob/main/CHANGELOG.md" target="_blank">Full Changelog</a></p>
+      <p><a href="https://github.com/TheOtterlord/deckmaster/blob/main/CHANGELOG.md" target="_blank">Full Changelog</a>
+      </p>
     </div>
     <div class="ir-flex-row">
       <button class="ir-flex ir-button" onclick="closeChangelog()">Close Changelog</button>
@@ -546,13 +553,16 @@ <h3 id="changed">Changed</h3>
 
   <div class="logs">
     <pre class="ir-code">Error Logs - DeckMaster Render Process</pre>
-    <button onclick="clipboard.writeText(this.previousElementSibling.innerHTML);notify('Copied to clipboard',2000)">Copy logs</button>
-    <button onclick="deckmaster.link('https://github.com/TheOtterlord/deckmaster/issues/new?body=**Explain problem below**%0A%0A```%0A'+this.previousElementSibling.previousElementSibling.innerHTML.replaceAll('\n', '%0A')+'%0A```')">Report on GitHub</button>
+    <button onclick="clipboard.writeText(this.previousElementSibling.innerHTML);notify('Copied to clipboard',2000)">Copy
+      logs</button>
+    <button
+      onclick="deckmaster.link('https://github.com/TheOtterlord/deckmaster/issues/new?body=**Explain problem below**%0A%0A```%0A'+this.previousElementSibling.previousElementSibling.innerHTML.replaceAll('\n', '%0A')+'%0A```')">Report
+      on GitHub</button>
     <button onclick="deckmaster.link('https://discord.gg/7kq56nhx9P')">Report on Discord</button>
     <button onclick="this.parentElement.style.display = 'none'">Close</button>
   </div>
 
   <div class="fade-bg hide" onclick="close_settings();closeChangelog()"></div>
 </body>
 
-</html>
+</html>

js/api.js

@@ -2,7 +2,7 @@ const { dialog } = require('electron').remote;
 const paths = require('path');
 
 const deckmaster = {
-  version: "v0.8.0",
+  version: "v0.8.1",
   notification: (title, text, onclick) => {
     const notification = new Notification(title, {
       body: text

js/combowidget.js

@@ -18,21 +18,21 @@ function displayComboMod(i) {
 }
 
 function displayCombo(i, i2) {
-  var combo = combos[i].combos[i2];
-  var img = document.querySelector(".preview .img img");
-  img.src = DEFAULT_IMG;
-  var text = document.querySelector(".preview .cardtext");
-  text.innerHTML = "";
-  text.innerHTML += `<h4>${combo.name}</h4>`;
-  text.innerHTML += `<p>${combo.desc}</p>`;
-  text.innerHTML += "<b>Raw Values</b>";
-  text.innerHTML += "<ul>";
-  for (let i = 0; i < combo.variants.length; i++) {
-    var variant = combo.variants[i];
-    text.innerHTML += `<li>Test ${i + 1}: ${variant.exact.toFixed(3)}%</li>`;
-  }
-  text.innerHTML += "</ul>";
-  text.innerHTML += `<p>Total Chance: ${combo.exact.toFixed(3)}%</p>`;
+  // var combo = combos[i].combos[i2];
+  // var img = document.querySelector(".preview .img img");
+  // img.src = DEFAULT_IMG;
+  // var text = document.querySelector(".preview .cardtext");
+  // text.innerHTML = "";
+  // text.innerHTML += `<h4>${combo.name}</h4>`;
+  // text.innerHTML += `<p>${combo.desc}</p>`;
+  // text.innerHTML += "<b>Raw Values</b>";
+  // text.innerHTML += "<ul>";
+  // for (let i = 0; i < combo.variants.length; i++) {
+  //   var variant = combo.variants[i];
+  //   text.innerHTML += `<li>Test ${i + 1}: ${variant.exact.toFixed(3)}%</li>`;
+  // }
+  // text.innerHTML += "</ul>";
+  // text.innerHTML += `<p>Total Chance: ${combo.exact.toFixed(3)}%</p>`;
 }
 
 function addComboMod() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deckmaster",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A Yu-Gi-Oh! TCG deck editor",
   "main": "index.js",
   "scripts": {