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

Merge branch 'master' of https://github.com/ThaumRystra/DiceCloud1

Browse Source
This commit is contained in:
Stefan Zermatten
2020-09-28 11:06:05 +02:00
parent 1f663bf4b4 311bbfa58c
commit ffb78c59b3
5 changed files with 179 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/globalHelpers/isTier5.js
View File

@@ -3,5 +3,5 @@ Template.registerHelper("isTier5", function(){
if (!user) return false;
patreon = user.patreon;
if (!patreon) return false;
return patreon.entitledCents >= 500 || patreon.entitledCentsOverride >= 500;
return patreon.entitledCents >= 300 || patreon.entitledCentsOverride >= 300;
});

28
app/client/views/character/inventory/inventory.js
View File

@@ -258,7 +258,7 @@ Template.inventoryItem.helpers({
},
});
Template.layout.events({
Template.inventory.events({
"dragstart .inventoryItem": function(event, instance){
event.originalEvent.dataTransfer.setData("dicecloud-id/items", this._id);
Session.set("inventory.dragItemId", this._id);
@@ -281,12 +281,6 @@ Template.layout.events({
event.preventDefault();
}
},
"dragover .characterRepresentative, dragenter .characterRepresentative":
function(event, instance){
if (_.contains(event.originalEvent.dataTransfer.types, "dicecloud-id/items")){
event.preventDefault();
}
},
"dragend .inventoryItem": function(event, instance){
Session.set("inventory.dragItemId", null);
},
@@ -330,24 +324,4 @@ Template.layout.events({
}
Session.set("inventory.dragItemId", null);
},
"drop .characterRepresentative": function(event, instance) {
if (_.contains(event.originalEvent.dataTransfer.types, "dicecloud-id/items")){
var itemId = event.originalEvent.dataTransfer.getData("dicecloud-id/items");
if (event.ctrlKey){
//split the stack to the container
pushDialogStack({
template: "splitStackDialog",
data: {
id: itemId,
parentCollection: "Characters",
parentId: this._id,
},
});
} else {
//move item to the character
Meteor.call("moveItemToCharacter", itemId, this._id);
}
Session.set("inventory.dragItemId", null);
}
},
});

26
app/client/views/characterList/characterSideList.js
View File

@@ -48,4 +48,30 @@ Template.characterSideList.events({
}
instance.openedParties.set(openedParties);
},
"dragover .characterRepresentative, dragenter .characterRepresentative":
function(event, instance){
if (_.contains(event.originalEvent.dataTransfer.types, "dicecloud-id/items")){
event.preventDefault();
}
},
"drop .characterRepresentative": function(event, instance) {
if (_.contains(event.originalEvent.dataTransfer.types, "dicecloud-id/items")){
var itemId = event.originalEvent.dataTransfer.getData("dicecloud-id/items");
if (event.ctrlKey){
//split the stack to the container
pushDialogStack({
template: "splitStackDialog",
data: {
id: itemId,
parentCollection: "Characters",
parentId: this._id,
},
});
} else {
//move item to the character
Meteor.call("moveItemToCharacter", itemId, this._id);
}
Session.set("inventory.dragItemId", null);
}
},
});