dragonleo/foundry-sw5e
1
0
Fork 0
forked from GitHub-Mirrors/foundry-sw5e
Code Issues Pull requests Projects Releases Wiki Activity

Merging with upsteam/master

Browse source
This commit is contained in:
Mike Magarino 2020-12-09 09:31:30 -05:00
parent 852309c973
commit 58c1548b81
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sw5e.js
View file

@ -235,9 +235,6 @@ Hooks.on("getChatLogEntryContext", chat.addChatMessageContextOptions);
Hooks.on("renderChatLog", (app, html, data) => Item5e.chatListeners(html));
Hooks.on("renderChatPopout", (app, html, data) => Item5e.chatListeners(html));
Hooks.on('getActorDirectoryEntryContext', Actor5e.addDirectoryContextOptions);
<<<<<<< HEAD
=======
Hooks.on("renderSceneDirectory", (app, html, data)=> {
//console.log(html.find("header.folder-header"));
setFolderBackground(html);
@ -258,7 +255,6 @@ Hooks.on("renderRollTableDirectory", (app, html, data)=> {
Hooks.on("ActorSheet5eCharacterNew", (app, html, data) => {
console.log("renderSwaltSheet");
});
>>>>>>> upstream/master
// TODO I should remove this
Handlebars.registerHelper('getProperty', function (data, property) {
return getProperty(data, property);