Skip to content

Commit

Permalink
Sh-x and Firefox Listeners fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Norc committed Jul 17, 2020
1 parent 985aaed commit ab8ee98
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
10 changes: 8 additions & 2 deletions css/custom-hotbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ div.chbSettings input[type="Number"] {
text-align: center;
border: black 1px;
float: left;
margin-right:0.5em;
margin-right: 0.75em;
}

div.chbSettings div.colorsplash {
Expand All @@ -190,4 +190,10 @@ div.chbSettings div.colorsplash {
padding-bottom: 0.4em;
border: black 1px;
border-radius: 0.5em;
}
}

span.custom-macro-key {
z-index: 2;
}

/* Make H1 and H2 less ridon1kulous */
1 change: 1 addition & 0 deletions custom-hotbar-settings-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,6 @@ export class CustomHotbarSettingsForm extends FormApplication {
super.activateListeners(html);
html.find('button[name="reset"]').click(this.onReset.bind(this));
this.reset = false;
//add on(input) thingie here
}
}
4 changes: 2 additions & 2 deletions custom-hotbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export class CustomHotbar extends Hotbar {
/** @override */

activateListeners(html) {
event.preventDefault();
//event.preventDefault();
super.activateListeners(html);
html.find('#custom-bar-toggle').click(this._onToggleBar.bind(this));
// Disable pages for now, will just work with first page.
Expand Down Expand Up @@ -314,7 +314,7 @@ export class CustomHotbar extends Hotbar {
*/
async _onClickMacro(event) {
console.debug("custom macro click detected!");

event.preventDefault();
const li = event.currentTarget;

Expand Down

0 comments on commit ab8ee98

Please sign in to comment.