krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

refresh gear overview (#10971)

Browse Source 
* refresh bought seasonal gear

* just "subscribe" to the _v change instead of returning the value

* subscribe in vue instead of lib
This commit is contained in:
negue
2019-02-10 19:32:14 +01:00
committed by Matteo Pagliazzi
parent 4d1b239231
commit 844d3fbf37
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/shops/seasonal/index.vue
View File

@@ -388,7 +388,9 @@
}, },
seasonal () { seasonal () {
// vue subscriptions, don't remove
let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line let backgroundUpdate = this.backgroundUpdate; // eslint-disable-line
const myUserVersion = this.user._v; // eslint-disable-line
let seasonal = shops.getSeasonalShop(this.user); let seasonal = shops.getSeasonalShop(this.user);

30
website/common/script/ops/pinnedGearUtils.js
View File

@@ -85,30 +85,16 @@ function removePinnedGearByClass (user) {
} }
function removePinnedGearAddPossibleNewOnes (user, itemPath, newItemKey) { function removePinnedGearAddPossibleNewOnes (user, itemPath, newItemKey) {
let currentPinnedItems = selectGearToPin(user);
let removeAndAddAllItems = false;
for (let item of currentPinnedItems) {
let itemInfo = getItemInfo(user, 'marketGear', item);
if (itemInfo.path === itemPath) {
removeAndAddAllItems = true;
break;
}
}
removeItemByPath(user, itemPath); removeItemByPath(user, itemPath);
if (removeAndAddAllItems) { // an item of the users current "new" gear was bought
// an item of the users current "new" gear was bought // remove the old pinned gear items and add the new gear back
// remove the old pinned gear items and add the new gear back removePinnedGearByClass(user);
removePinnedGearByClass(user); user.items.gear.owned[newItemKey] = true;
user.items.gear.owned[newItemKey] = true; addPinnedGearByClass(user);
addPinnedGearByClass(user);
} else { // update the version, so that vue can refresh the seasonal shop
// just change the new gear to owned user._v++;
user.items.gear.owned[newItemKey] = true;
}
} }
/** /**