fix bug exposed by eslint fix

SeeClickFix · Nov 6, 2024 · 268afff · 268afff
1 parent 364beef
commit 268afff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/addon/components/bs-button.hbs b/addon/components/bs-button.hbs
@@ -1,6 +1,6 @@
 <button
   disabled={{this.__disabled}}
-  type={{this.buttonType}}
+  type={{this._buttonType}}
   class="btn {{if @active "active"}} {{if this.block "btn-block"}} {{bs-size-class "btn" @size}} {{bs-type-class "btn" @type default=(if (macroCondition (macroGetOwnConfig "isBS3")) "default" "secondary") outline=@outline}}"
   ...attributes
   {{on "click" this.handleClick}}

diff --git a/addon/components/bs-button.js b/addon/components/bs-button.js
@@ -164,6 +164,13 @@ export default class Button extends Component {
    */
   @arg buttonType = 'button';
 
+  get _buttonType() {
+    if (this.args.buttonType === 'primary') {
+      return 'submit';
+    }
+    return this.args.buttonType;
+  }
+
   /**
    * Set the 'active' class to apply active/pressed CSS styling
    *

diff --git a/tests/integration/components/bs-modal/footer-test.js b/tests/integration/components/bs-modal/footer-test.js
@@ -18,7 +18,7 @@ module('Integration | Component | bs-modal/footer', function (hooks) {
     assert.strictEqual(
       this.element.querySelector('.modal-footer button').getAttribute('type'),
       'button',
-      'Submit button is of type submit.'
+      'Submit button is of type button.'
     );
     assert.dom('.modal-footer button').hasText('close', 'Button title is correct.');
   });
@@ -31,7 +31,7 @@ module('Integration | Component | bs-modal/footer', function (hooks) {
     assert.strictEqual(
       this.element.querySelector('.modal-footer button:first-child').getAttribute('type'),
       'button',
-      'Submit button is of type submit.'
+      'Submit button is of type button.'
     );
     assert.dom('.modal-footer button:first-child').hasText('close', 'Close button title is correct.');
     assert.dom('.modal-footer button:last-child').hasClass('btn-primary', 'Submit button is a primary button.');