feildmaster
diff --git a/‎src/base/craft/disenchant.js‎
Lines changed: 26 additions & 33 deletions b/‎src/base/craft/disenchant.js‎
Lines changed: 26 additions & 33 deletions
diff --git a/‎src/base/updates.js‎
Lines changed: 1 addition & 1 deletion b/‎src/base/updates.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/utils/settings.js‎
Lines changed: 3 additions & 0 deletions b/‎src/utils/settings.js‎
Lines changed: 3 additions & 0 deletions
@@ -1,3 +1,4 @@
+// globals updateQuantity, currentPage, applyFilters, showPage, collection
 onPage('Crafting', function disenchant() {
   eventManager.on('jQuery', () => {
     const button = $('<button class="btn btn-info">Smart Disenchant</button>');
@@ -71,7 +72,7 @@ onPage('Crafting', function disenchant() {
       .then((response) => {
         if (!response) throw new Error('All errored out');
         const data = response.data;
-        const gained = data.dust - parseInt($('#dust').text());
+        const gained = data.dust - parseInt($('#dust').text(), 10);
         $('#dust').text(data.dust);
         $('#totalDisenchant').text(data.totalDisenchant);
         $('#nbDTFragments').text(data.DTFragments);
@@ -80,6 +81,8 @@ onPage('Crafting', function disenchant() {
         if (data.DTFragments) {
           $('#DTFragmentsDiv').show();
         }
+        applyFilters();
+        showPage(currentPage);
         updateOrToast(toast, `Finished disenchanting.\n+${gained} dust`);
       }).catch(() => {
         updateOrToast(toast, 'Could not complete disenchanting.');
@@ -129,8 +132,7 @@ onPage('Crafting', function disenchant() {
         debug('set');
         last = response;
       }
-      const quantity = cardHelper.find(response.data.cardId, response.data.shiny).querySelector(`#quantity .nb`);
-      quantity.textContent = parseInt(quantity.textContent) - 1;
+      updateQuanity(JSON.parse(response.data.card), -1); // External
     });
     if (redo.length) {
       debug(`Redoing ${redo.length}`);
@@ -140,40 +142,31 @@ onPage('Crafting', function disenchant() {
     return last;
   }
 
+  function cardFilter(card, shiny, priority, family) {
+    // TODO: Family filters
+    return card.quantity > 0 && include(card.rarity) && (priority || card.shiny === shiny);
+  }
+
   function calcCards({shiny, priority, deltarune}) {
     const cards = {};
     const extras = [];
-    $('table.cardBoard').filter(function() {
-      // Don't include DT/unknown cards
-      return include(cardHelper.rarity(this));
-    }).filter(function() {
-      // We want to calculate all cards for "priority", otherwise we only want shiny/normals
-      return priority || cardHelper.shiny(this) === shiny;
-    }).filter(function() {
-      // We only care if we actually have cards to remove
-      return cardHelper.craft.quantity(this) > 0;
-    }).each(function() {
-      const id = this.id;
-      const quantity = cardHelper.craft.quantity(this);
-      const rarity = cardHelper.rarity(this);
-      if (priority) {
-        if (!cards.hasOwnProperty(id)) {
-          const max = cardHelper.craft.max(rarity);
-          if (!max) return;
-          cards[id] = {
-            max, rarity,
-            name: cardHelper.name(this),
-          };
+    collection.filter((card) => cardFilter(card, shiny, priority, deltarune))
+      .forEach(({id, name, shiny: isShiny, rarity, quantity}) => {
+        if (priority) {
+          if (!cards.hasOwnProperty(id)) {
+            const max = cardHelper.craft.max(rarity);
+            if (!max) return;
+            cards[id] = {
+              max, rarity, name,
+            };
+          }
+          cards[id][isShiny?'shiny':'normal'] = quantity;
+        } else {
+          extras.push({
+            id, name, rarity, quantity, shiny,
+          });
         }
-        const isShiny = cardHelper.shiny(this);
-        cards[id][isShiny?'shiny':'normal'] = quantity;
-      } else {
-        extras.push({
-          id, rarity, quantity, shiny,
-          name: cardHelper.name(this),
-        });
-      }
-    });
+      });
     if (priority) {
       // Calculate extras
       fn.each(cards, function(data, id) {
 
@@ -95,7 +95,7 @@
         if (!isNewer(data)) {
           noUpdateFound();
         } else {
-          toast.close(); // I need a wait to change the 'onclose'
+          toast.close(); // I need a way to change the 'onclose'
           compareAndToast(data);
         }
       });
 
@@ -407,6 +407,9 @@ const settings = (() => {
     });
   });
 
+  // Main page is always first
+  init('main');
+
   return {
     open, close, setDisplayName, isOpen, value, remove,
     register: add,
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@`
`95`	`95`	`if (!isNewer(data)) {`
`96`	`96`	`noUpdateFound();`
`97`	`97`	`} else {`
`98`		`- toast.close(); // I need a wait to change the 'onclose'`
	`98`	`+ toast.close(); // I need a way to change the 'onclose'`
`99`	`99`	`compareAndToast(data);`
`100`	`100`	`}`
`101`	`101`	`});`