jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed stack dragging within the same container

Browse Source
This commit is contained in:
Stefan Zermatten
2015-05-11 17:10:58 +02:00
parent 3f4dcc146a
commit 43c4122fe3
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rpg-docs/Model/Inventory/Items.js
View File

@@ -74,15 +74,14 @@ var moveItem = function(itemId, enable, parentCollection, parentId) {
item.parent.id !== parentId || item.parent.id !== parentId ||
item.enabled !== enable item.enabled !== enable
){ ){
var setter = {$set: { Items.update(
"parent.collection": parentCollection, itemId,
"parent.id": parentId, {$set: {
enabled: enable, "parent.collection": parentCollection,
}}; "parent.id": parentId,
if (parentCollection === "Characters"){ enabled: enable,
setter.$set.charId = parentId; }}
} );
Items.update(itemId, setter);
} }
}; };
@@ -137,15 +136,13 @@ Meteor.methods({
//create a new item stack //create a new item stack
var newStack = _.omit(EJSON.clone(item), "_id"); var newStack = _.omit(EJSON.clone(item), "_id");
newStack.parent = parent; newStack.parent = parent;
if (newStack.parent.collection === "Characters"){
newStack.charId = newStack.parent.id;
}
newStack.quantity = moveQuantity; newStack.quantity = moveQuantity;
//find out if we have an exact replica in the destination //find out if we have an exact replica in the destination
var query = _.omit(newStack, ["parent", "quantity"]); var query = _.omit(newStack, ["parent", "quantity"]);
query["parent.collection"] = newStack.parent.collection; query["parent.collection"] = newStack.parent.collection;
query["parent.id"] = newStack.parent.id; query["parent.id"] = newStack.parent.id;
query._id = {$ne: itemId}; //make sure we don't join it to itself
var existingStack = Items.findOne(query); var existingStack = Items.findOne(query);
if (existingStack){ if (existingStack){
//increase the existing stack's size //increase the existing stack's size