fix: spacebar toggle

knownasilya · Sep 25, 2020 · cecbdb9 · cecbdb9
1 parent f893b07
commit cecbdb9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/addon/components/x-toggle-switch/component.js b/addon/components/x-toggle-switch/component.js
@@ -23,17 +23,6 @@ export default class XToggleSwitch extends Component {
     return `x-toggle-${theme}`;
   }
 
-  @action
-  spacebarToggle(event) {
-    // spacebar: 32
-    if (event.which === 32) {
-      let value = this.value;
-
-      this.sendToggle(!value);
-      event.preventDefault();
-    }
-  }
-
   @action
   handlePanRight() {
     if (this.disabled) {

diff --git a/addon/components/x-toggle-switch/template.hbs b/addon/components/x-toggle-switch/template.hbs
@@ -16,7 +16,6 @@
     disabled={{@disabled}}
     id={{@forId}}
     name={{@name}}
-    {{on 'keypress' this.spacebarToggle}} 
     {{on 'change' (action @sendToggle value='target.checked')}}
   />
 

diff --git a/addon/components/x-toggle/component.js b/addon/components/x-toggle/component.js
@@ -51,6 +51,17 @@ export default class XToggle extends Component {
     this.toggleSwitch(value);
   }
 
+  @action
+  spacebarToggle(event) {
+    // spacebar: 32
+    if (event.which === 32) {
+      let value = this.value;
+
+      this.sendToggle(!value);
+      event.preventDefault();
+    }
+  }
+
   @action
   handleFocusIn() {
     this.set('focused', true);

diff --git a/addon/components/x-toggle/template.hbs b/addon/components/x-toggle/template.hbs
@@ -5,6 +5,7 @@
   ...attributes
   {{on 'focusin' this.handleFocusIn}}
   {{on 'focusout' this.handleFocusOut}}
+  {{on 'keypress' this.spacebarToggle}}
 >
   {{#if hasBlock}}
     {{yield