From 9cb071b0c07d7e777d09658f66c5569abfcb40c5 Mon Sep 17 00:00:00 2001
From: Julian Breuksch <julian.breuksch@sap.com>
Date: Thu, 21 Nov 2019 16:11:41 +0100
Subject: [PATCH] refactor(ui5-switch): subscribe event handlers within HBS
 template

---
 packages/main/src/Switch.hbs | 3 +++
 packages/main/src/Switch.js  | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/main/src/Switch.hbs b/packages/main/src/Switch.hbs
index c1557acb2891..19f343d8ac12 100644
--- a/packages/main/src/Switch.hbs
+++ b/packages/main/src/Switch.hbs
@@ -4,6 +4,9 @@
 	aria-checked="{{checked}}"
 	aria-disabled="{{ariaDisabled}}"
 	aria-labelledby="{{_id}}-hiddenText"
+	@click="{{_onclick}}"
+	@keyup="{{_onkeyup}}"
+	@keydown="{{_onkeydown}}"
 	tabindex="{{tabIndex}}"
 	dir="{{rtl}}"
 >
diff --git a/packages/main/src/Switch.js b/packages/main/src/Switch.js
index 5b21739c5c92..7b0a4cded7bd 100644
--- a/packages/main/src/Switch.js
+++ b/packages/main/src/Switch.js
@@ -105,7 +105,6 @@ const metadata = {
 		 */
 		change: {},
 	},
-	_eventHandlersByConvention: true,
 };
 
 /**
@@ -159,11 +158,11 @@ class Switch extends UI5Element {
 		this.i18nBundle = getI18nBundle("@ui5/webcomponents");
 	}
 
-	onclick(event) {
+	_onclick(event) {
 		this.toggle();
 	}
 
-	onkeydown(event) {
+	_onkeydown(event) {
 		if (isSpace(event)) {
 			event.preventDefault();
 		}
@@ -173,7 +172,7 @@ class Switch extends UI5Element {
 		}
 	}
 
-	onkeyup(event) {
+	_onkeyup(event) {
 		if (isSpace(event)) {
 			this.toggle();
 		}