Merge remote-tracking branch 'origin/main'

src/module/sheets/characterSheet.mjs

@@ -254,6 +254,7 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
     }
 
     static #startResting(event, target) {
+
         const dialog = new RestingDialog(this.document)
 
         dialog.render(true)
@@ -355,6 +356,7 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
         event.preventDefault()
 
         await this.document.update(formData.object)
+        return false
     }
 
     static async #rollDamage(event, target) {

src/style/organisms/_character-sheet.scss

@@ -38,6 +38,9 @@
       }
 
       .rkp {
+        overflow: hidden;
+        padding-bottom: 6px;
+        text-wrap: nowrap;
 
         .pill {
           @include buttons.pill-button;

src/templates/actor/character/main-sheet.hbs

@@ -56,7 +56,7 @@
         {{/if}}
 
         <div class="sidebar-element button">
-            <button data-action="rest"><i class="fa-solid fa-bed"></i> Rasten</button>
+            <button type="button" data-action="rest"><i class="fa-solid fa-bed"></i> Rasten</button>
         </div>
 
         {{#each attacks}}
@@ -130,14 +130,14 @@
 
     <div class="sidebuttons">
         <div>
-            <button data-action="openStandaloneADVSF">Vorteile</button>
-            <button data-action="openStandaloneHealth">Gesundheit</button>
-            <button data-action="openStandaloneSkills">Talente</button>
-            <button data-action="openBagpack">Inventar</button>
+            <button type="button" data-action="openStandaloneADVSF">Vorteile</button>
+            <button type="button" data-action="openStandaloneHealth">Gesundheit</button>
+            <button type="button" data-action="openStandaloneSkills">Talente</button>
+            <button type="button" data-action="openBagpack">Inventar</button>
             {{#if this.hasLiturgies}}
-                <button data-action="openStandaloneLiturgies">Liturgien</button>{{/if}}
+                <button type="button" data-action="openStandaloneLiturgies">Liturgien</button>{{/if}}
             {{#if this.hasSpells}}
-                <button data-action="openStandaloneSpells">Zauber</button>{{/if}}
+                <button type="button" data-action="openStandaloneSpells">Zauber</button>{{/if}}
         </div>
     </div>
 

src/templates/actor/character/standalone/bagpack.hbs

@@ -10,8 +10,8 @@
 
 
     <div class="buttons">
-        <button data-action="newItem"><i class="fa-solid fa-sack" data-tooltip="Neuer Gegenstand"></i></button>
-        <button data-action="openItemBrowser"><i class="fa-solid fa-store" data-tooltip="Einkaufen"></i></button>
+        <button type="button" data-action="newItem"><i class="fa-solid fa-sack" data-tooltip="Neuer Gegenstand"></i></button>
+        <button type="button" data-action="openItemBrowser"><i class="fa-solid fa-store" data-tooltip="Einkaufen"></i></button>
     </div>
 
 

src/templates/actor/character/tab-effects.hbs

@@ -18,7 +18,7 @@
                 </td>
                 <td>{{this.conditions}}</td>
                 <td>{{#if ../isGM}}
-                    <button data-action="removeEffect" data-actor-id="{{actor}}" data-effect-id="{{id}}"><i
+                    <button type="button" data-action="removeEffect" data-actor-id="{{actor}}" data-effect-id="{{id}}"><i
                             class="fa-solid fa-trash"></i></button>{{/if}}</td>
             </tr>
         {{/each}}

src/templates/actor/character/tab-equipment.hbs

@@ -18,8 +18,8 @@
     <div class="inventory-header">
         <h3>Inventar</h3>
         <div class="buttons">
-            <button data-action="newItem"><i class="fa-solid fa-sack" data-tooltip="Neuer Gegenstand"></i></button>
-            <button data-action="openItemBrowser"><i class="fa-solid fa-store" data-tooltip="Einkaufen"></i></button>
+            <button type="button" data-action="newItem"><i class="fa-solid fa-sack" data-tooltip="Neuer Gegenstand"></i></button>
+            <button type="button" data-action="openItemBrowser"><i class="fa-solid fa-store" data-tooltip="Einkaufen"></i></button>
         </div>
     </div>
     <div class="inventory">

src/templates/actor/character/tab-set.hbs

@@ -15,9 +15,9 @@
     {{/each}}
 
     {{#if setEquipped}}
-        <button disabled="disabled">Ausgerüstet</button>
+        <button type="button" disabled="disabled">Ausgerüstet</button>
     {{else}}
-        <button data-action="switchSet" data-id="{{@index}}">Wechseln</button>
+        <button type="button" data-action="switchSet" data-id="{{@index}}">Wechseln</button>
     {{/if}}
 
 

src/templates/actor/character/tab-set2.hbs

@@ -19,9 +19,9 @@
                     src="{{this.icon}}"/></div>
         {{/each}}
         {{#if (eq ../actor.system.setEquipped @index)}}
-            <button disabled="disabled">Ausgerüstet</button>
+            <button type="button" disabled="disabled">Ausgerüstet</button>
         {{else}}
-            <button data-operation="switchSet" data-id="{{@index}}">Wechseln</button>
+            <button type="button" data-operation="switchSet" data-id="{{@index}}">Wechseln</button>
         {{/if}}
 
     </div>

src/templates/actor/character/tab-set3.hbs

@@ -19,9 +19,9 @@
                     src="{{this.icon}}"/></div>
         {{/each}}
         {{#if (eq ../actor.system.setEquipped @index)}}
-            <button disabled="disabled">Ausgerüstet</button>
+            <button type="button" disabled="disabled">Ausgerüstet</button>
         {{else}}
-            <button data-operation="switchSet" data-id="{{@index}}">Wechseln</button>
+            <button type="button" data-operation="switchSet" data-id="{{@index}}">Wechseln</button>
         {{/if}}
 
     </div>

src/templates/actor/creature/tab-attacks.hbs

@@ -45,9 +45,8 @@
                            value="{{this.tp}}"/>
                 </td>
                 <td>
-                    <button class="button-inline remove-attack" data-action="removeAttack" data-index="{{this.index}}">
-                        <i
-                                class="fa-solid fa-trash"></i></button>
+                    <button type="button" class="button-inline remove-attack" data-action="removeAttack" data-index="{{this.index}}">
+                        <i class="fa-solid fa-trash"></i></button>
                 </td>
             </tr>
         {{/each}}
@@ -73,7 +72,7 @@
                 <input type="text" id="attack_tp" placeholder="1d6+3"/>
             </td>
             <td>
-                <button data-action="addAttack" class="button-inline add-attack"><i class="fa-solid fa-plus"></i>
+                <button type="button" data-action="addAttack" class="button-inline add-attack"><i class="fa-solid fa-plus"></i>
                 </button>
             </td>
 

src/templates/actor/merchant/tab-goods.hbs

@@ -8,7 +8,7 @@
                 <img src="{{this.img}}" style="width: 32px; height: 32px;"/>
                 <span class="name">{{this.name}}</span>
                 <span class="price">{{currency this.system.price}}</span>
-                <button data-action="buy" data-item-id="{{this._id}}"><i class="fa-solid fa-coins"></i></button>
+                <button type="button" data-action="buy" data-item-id="{{this._id}}"><i class="fa-solid fa-coins"></i></button>
             </div>
         {{/each}}
     </div>

src/templates/actor/merchant/tab-services.hbs

@@ -21,7 +21,7 @@
                         <input type="number" name="system.services.{{@key}}.availability"
                                value="{{this.availability}}"/>
                     </label>
-                    <button class="actions" data-action="removeService" data-row-id="{{@key}}"><i
+                    <button type="button" class="actions" data-action="removeService" data-row-id="{{@key}}"><i
                             class="fa-solid fa-trash"></i></button>
                     <div class="description">
                         <label class="description_label">Beschreibung</label>
@@ -42,7 +42,7 @@
                     <span class="availability {{#if
                             (lte this.availability 0)}}infinite{{/if}}">{{#unless
                             (lte this.availability 0)}}{{this.availability}}{{/unless}}</span>
-                    <button class="actions"><i class="fa-solid fa-coins"></i></button>
+                    <button type="button" class="actions"><i class="fa-solid fa-coins"></i></button>
                 </div>
             {{/if}}
         {{/each}}

src/templates/dialog/attribute-dialog.hbs

@@ -51,7 +51,7 @@
     </fieldset>
 
 
-    <button class="actions" data-action="use"><i class="fa-solid fa-bolt"></i> Eigenschaftseinsatz {{#if modResult}}
+    <button type="button" class="actions" data-action="use"><i class="fa-solid fa-bolt"></i> Eigenschaftseinsatz {{#if modResult}}
         [{{displayModResult}}]{{/if}}</button>
 
 </section>

src/templates/dialog/battle-dialog.hbs

@@ -13,7 +13,7 @@
                 <option value="glückspiel-v-glückspiel">Vergleichend: Glücksspiel</option>
                 <option value="falschspiel-v-sinnenschärfe">Schummeln</option>
             </select>
-            <button data-action="applyPreset"><i class="fa-solid fa-fill"></i></button>
+            <button type="button" data-action="applyPreset"><i class="fa-solid fa-fill"></i></button>
         </label>
     </div>
 
@@ -338,7 +338,7 @@
             <div class="offenseActorSave"><label><input name="saveOffenseData" type="checkbox">Daten speichern</label>
             </div>
         {{/if}}
-        <button data-action="doBattle"><i class="fa-solid fa-user-secret"></i> Würfeln</button>
+        <button type="button" data-action="doBattle"><i class="fa-solid fa-user-secret"></i> Würfeln</button>
         {{#if (or (not defenseTalents) (not defenseAttributes))}}
             <div class="defenseActorSave"><label><input name="saveDefenseData" type="checkbox">Daten speichern</label>
             </div>

src/templates/dialog/combat-action.hbs

@@ -57,7 +57,7 @@
 
 
     <div class="actions">
-        <button {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
+        <button type="button" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
                 class="fa-solid fa-swords"></i>Angreifen <span
                 class="value"></span></button>
     </div>

src/templates/dialog/defense-action.hbs

@@ -43,7 +43,7 @@
 
 
     <div class="actions">
-        <button {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
+        <button type="button" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
                 class="fa-solid fa-shield"></i>Verteidigen <span
                 class="value"></span></button>
     </div>

src/templates/dialog/liturgy-dialog.hbs

@@ -54,7 +54,7 @@
                 <td>{{this.displayRank}}</td>
                 <td>{{this.mod}}</td>
                 <td>
-                    <button data-action="removeMod" data-index="{{@key}}">
+                    <button type="button" data-action="removeMod" data-index="{{@key}}">
                         <i class="fa-solid fa-xmark"></i>
                     </button>
                 </td>
@@ -74,7 +74,7 @@
             <option value="castduration">Wirkzeit</option>
             <option value="duration">Wirkungsdauer</option>
         </select>
-        <button data-action="addMod"><i class="fa fa-plus"></i></button>
+        <button type="button" data-action="addMod"><i class="fa fa-plus"></i></button>
         <span id="info"></span>
     </div>
 </div>
@@ -97,7 +97,7 @@
     </fieldset>
 
 
-    <button class="actions" data-action="castLiturgy"><i class="fa-solid fa-sparkles"></i> Wirken {{#if modResult}}
+    <button type="button" class="actions" data-action="castLiturgy"><i class="fa-solid fa-sparkles"></i> Wirken {{#if modResult}}
         [{{displayModResult}}]{{/if}}</button>
 
 </section>

src/templates/dialog/resting-dialog.hbs

@@ -71,5 +71,5 @@
         </div>
 
     </fieldset>
-    <button class="actions" data-action="regenerate"><i class="fa-solid fa-bed"></i> Regenerieren</button>
+    <button type="button" class="actions" data-action="regenerate"><i class="fa-solid fa-bed"></i> Regenerieren</button>
 </section>

src/templates/dialog/spell-dialog.hbs

@@ -63,7 +63,7 @@
             </fieldset>
         {{/if}}
 
-            <button class="actions" {{#unless noSelectedRepresentation}}data-action="diceRoll"{{else}} disabled="disabled"{{/unless}}><i class="fa-solid fa-dice"></i> Zauber würfeln {{#if
+            <button type="button" class="actions" {{#unless noSelectedRepresentation}}data-action="diceRoll"{{else}} disabled="disabled"{{/unless}}><i class="fa-solid fa-dice"></i> Zauber würfeln {{#if
                 displayModResult}}
             [{{displayModResult}}]{{/if}}</button>
 
@@ -137,11 +137,11 @@
     </fieldset>
 
     <div class="actions">
-        <button {{#if ready}}data-action="cast" {{else}}
+        <button type="button" {{#if ready}}data-action="cast" {{else}}
         data-tooltip="{{{notReadyReasons}}}" disabled="disabled" {{/if}}><i class="fa-solid fa-sparkles"></i> Zauber
             wirken
         </button>
-        <button data-action="cancel">
+        <button type="button" data-action="cancel">
             Zauber abbrechen
         </button>
     </div>

src/templates/dialog/talent-dialog.hbs

@@ -51,7 +51,7 @@
     </fieldset>
 
 
-    <button class="actions" data-action="use"><i class="fa-solid fa-bolt"></i> Talenteinsatz {{#if modResult}}
+    <button type="button" class="actions" data-action="use"><i class="fa-solid fa-bolt"></i> Talenteinsatz {{#if modResult}}
         [{{displayModResult}}]{{/if}}</button>
 
 </section>

src/templates/item/activeeffect/main-sheet.hbs

@@ -4,7 +4,7 @@
         <img class="img" src="{{img}}" data-action="editImage" data-edit="img" alt="{{name}}" title="{{name}}"/>
         <input type="text" name="name" value="{{name}}"/>
 
-        <button class="editEffects" data-id="{{this.effectId}}" data-action="openEffect">
+        <button type="button" class="editEffects" data-id="{{this.effectId}}" data-action="openEffect">
             <i class="fas fa-pencil-alt"></i>
         </button>
     </div>

src/templates/item/deity-sheet.hbs

@@ -48,7 +48,7 @@
                     {{#each liturgies.rank0}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="0" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="0" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="0" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -61,7 +61,7 @@
                     {{#each liturgies.rank1}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="1" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="1" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="1" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -74,7 +74,7 @@
                     {{#each liturgies.rank2}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="2" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="2" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="2" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -87,7 +87,7 @@
                     {{#each liturgies.rank3}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="3" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="3" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="3" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -100,7 +100,7 @@
                     {{#each liturgies.rank4}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="4" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="4" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="4" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -113,7 +113,7 @@
                     {{#each liturgies.rank5}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="5" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="5" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="5" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -126,7 +126,7 @@
                     {{#each liturgies.rank6}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="6" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="6" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="6" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -139,7 +139,7 @@
                     {{#each liturgies.rank7}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="7" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="7" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="7" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}
@@ -152,7 +152,7 @@
                     {{#each liturgies.rank8}}
                         <div class="liturgy" data-action="openLiturgy" data-rank="8" data-liturgy-id="{{this.id}}">
                             <span>{{this.name}}</span>
-                            <button data-action="removeLiturgy" data-rank="8" data-liturgy-id="{{this.id}}"
+                            <button type="button" data-action="removeLiturgy" data-rank="8" data-liturgy-id="{{this.id}}"
                                     class="mini"><i class="fa fa-xmark"></i></button>
                         </div>
                     {{/each}}

src/templates/item/liturgy/tab-commonality.hbs

@@ -15,7 +15,7 @@
                         <input name="grad" type="number" min="0" max="7" step="1"/>
                     </label>
                     <div class="actions">
-                        <button data-action="addCommonality"><i class="fa-solid fa-plus"></i> Hinzugefügen</button>
+                        <button type="button" data-action="addCommonality"><i class="fa-solid fa-plus"></i> Hinzugefügen</button>
                     </div>
                 </div>
             </fieldset>
@@ -27,7 +27,7 @@
                     <span class="deity">{{this.name}}</span>
                     <span class="rank">Grad {{grad}}</span>
                     {{#if ../editable}}
-                        <button class="action" data-action="removeCommonality" data-id="{{@key}}"><i
+                        <button type="button" class="action" data-action="removeCommonality" data-id="{{@key}}"><i
                                 class="fa-solid fa-xmark"></i></button>
                     {{/if}}
                 </div>

src/templates/ui/partial-cooldown.hbs

@@ -7,7 +7,7 @@
           data-action="activateCooldown"
         {{/if}}
           data-cooldown-id="{{@key}}">{{this.title}}</span>
-        <button data-tooltip="{{localize "COOLDOWN.cancel" t=this.title}}" class="btn-right"
+        <button type="button" data-tooltip="{{localize "COOLDOWN.cancel" t=this.title}}" class="btn-right"
                 data-action="cancelCooldown" data-cooldown-id="{{@key}}">
             <i class="fa-solid fa-xmark"></i>
         </button>

src/templates/ui/tab-variants.hbs

@@ -6,9 +6,9 @@
         <legend class="variant-operator"><select name="variant">
             {{selectOptions variantChoices selected=currentSelectedVariantName inverted=true}}
         </select>
-            <button {{#if currentSelectedVariant}}data-action="addVariant" {{else}}disabled="disabled"{{/if}}><i
+            <button type="button" {{#if currentSelectedVariant}}data-action="addVariant" {{else}}disabled="disabled"{{/if}}><i
                     class="fa-solid fa-plus"></i></button>
-            <button {{#if currentSelectedVariant}}data-action="removeVariant" {{else}}disabled="disabled"{{/if}}><i
+            <button type="button" {{#if currentSelectedVariant}}data-action="removeVariant" {{else}}disabled="disabled"{{/if}}><i
                     class="fa-solid fa-minus"></i></button>
         </legend>
 
@@ -91,7 +91,7 @@
                                 {{/if}}
                             {{/if}}
                             <td>
-                                <button data-action="removeRequirement" data-index="{{@key}}"><i
+                                <button type="button" data-action="removeRequirement" data-index="{{@key}}"><i
                                         class="fa-solid fa-trash"></i></button>
                             </td>
                         </tr>
@@ -100,7 +100,7 @@
                     <tfoot>
                     <tr>
                         <td colspan="4">
-                            <button {{#if currentSelectedVariant}}data-action="addRequirement"
+                            <button type="button" {{#if currentSelectedVariant}}data-action="addRequirement"
                                         {{else}}disabled="disabled"{{/if}}><i class="fa-solid fa-plus"></i></button>
                         </td>
                     </tr>
@@ -116,7 +116,7 @@
                             <td><input type="text" value="{{this.name}}" name="mod.{{@key}}.name"/></td>
                             <td><input type="number" value="{{this.value}}" name="mod.{{@key}}.value"/></td>
                             <td>
-                                <button data-action="removeMod" data-index="{{@key}}"><i class="fa-solid fa-trash"></i>
+                                <button type="button" data-action="removeMod" data-index="{{@key}}"><i class="fa-solid fa-trash"></i>
                                 </button>
                             </td>
                         </tr>
@@ -125,7 +125,7 @@
                     <tfoot>
                     <tr>
                         <td colspan="3">
-                            <button {{#if currentSelectedVariant}}data-action="addMod"
+                            <button type="button" {{#if currentSelectedVariant}}data-action="addMod"
                                         {{else}}disabled="disabled"{{/if}}><i class="fa-solid fa-plus"></i></button>
                         </td>
                     </tr>
@@ -134,7 +134,7 @@
             </div>
         {{/if}}
 
-        <button {{#if currentSelectedVariant}}data-action="saveVariant" {{else}}disabled="disabled"{{/if}}><i
+        <button type="button" {{#if currentSelectedVariant}}data-action="saveVariant" {{else}}disabled="disabled"{{/if}}><i
                 class="fa-solid fa-save"></i> Speichern
         </button>