From 456f304338673d87c8348cb3e7da11a05947e627 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 28 Sep 2022 23:32:04 +0200
Subject: [PATCH] Removed CheckboxSimple component (was only used at login)

---
 dev/App/Abstract.js                           |  2 --
 dev/Component/AbstractCheckbox.js             | 23 -------------
 dev/Component/Checkbox.js                     |  3 --
 dev/Component/MaterialDesign/Checkbox.js      | 19 +++++++++--
 dev/Styles/Components.less                    | 34 +++++++++----------
 dev/Styles/Login.less                         |  1 -
 .../templates/Views/Components/Checkbox.html  |  6 ----
 .../0.0.0/app/templates/Views/User/Login.html | 11 +++---
 8 files changed, 38 insertions(+), 61 deletions(-)
 delete mode 100644 dev/Component/AbstractCheckbox.js
 delete mode 100644 dev/Component/Checkbox.js
 delete mode 100644 snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html

diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index 7d215246b..74e808167 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -11,7 +11,6 @@ import { ThemeStore } from 'Stores/Theme';
 import { InputComponent } from 'Component/Input';
 import { SelectComponent } from 'Component/Select';
 import { CheckboxMaterialDesignComponent } from 'Component/MaterialDesign/Checkbox';
-import { CheckboxComponent } from 'Component/Checkbox';
 
 export class AbstractApp {
 	/**
@@ -49,7 +48,6 @@ export class AbstractApp {
 		register('Input', InputComponent);
 		register('Select', SelectComponent);
 		register('Checkbox', CheckboxMaterialDesignComponent, 'CheckboxMaterialDesignComponent');
-		register('CheckboxSimple', CheckboxComponent, 'CheckboxComponent');
 
 		initOnStartOrLangChange();
 
diff --git a/dev/Component/AbstractCheckbox.js b/dev/Component/AbstractCheckbox.js
deleted file mode 100644
index 812da3108..000000000
--- a/dev/Component/AbstractCheckbox.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import ko from 'ko';
-
-export class AbstractCheckbox {
-	/**
-	 * @param {Object} params = {}
-	 */
-	constructor(params = {}) {
-		this.value = ko.isObservable(params.value) ? params.value
-			: ko.observable(!!params.value);
-
-		this.enable = ko.isObservable(params.enable) ? params.enable
-			: ko.observable(undefined === params.enable || !!params.enable);
-
-		this.label = params.label || '';
-		this.inline = !!params.inline;
-
-		this.labeled = undefined !== params.label;
-	}
-
-	click() {
-		this.enable() && this.value(!this.value());
-	}
-}
diff --git a/dev/Component/Checkbox.js b/dev/Component/Checkbox.js
deleted file mode 100644
index 9927babdc..000000000
--- a/dev/Component/Checkbox.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AbstractCheckbox } from 'Component/AbstractCheckbox';
-
-export class CheckboxComponent extends AbstractCheckbox {}
diff --git a/dev/Component/MaterialDesign/Checkbox.js b/dev/Component/MaterialDesign/Checkbox.js
index 48cdcd72d..a15351256 100644
--- a/dev/Component/MaterialDesign/Checkbox.js
+++ b/dev/Component/MaterialDesign/Checkbox.js
@@ -1,3 +1,18 @@
-import { AbstractCheckbox } from 'Component/AbstractCheckbox';
+export class CheckboxMaterialDesignComponent {
+	constructor(params = {}) {
+		this.value = ko.isObservable(params.value) ? params.value
+			: ko.observable(!!params.value);
 
-export class CheckboxMaterialDesignComponent extends AbstractCheckbox {}
+		this.enable = ko.isObservable(params.enable) ? params.enable
+			: ko.observable(undefined === params.enable || !!params.enable);
+
+		this.label = params.label;
+		this.inline = params.inline;
+
+		this.labeled = null != params.label;
+	}
+
+	click() {
+		this.enable() && this.value(!this.value());
+	}
+}
diff --git a/dev/Styles/Components.less b/dev/Styles/Components.less
index 0cc3edb44..5a96e8c60 100644
--- a/dev/Styles/Components.less
+++ b/dev/Styles/Components.less
@@ -41,23 +41,6 @@
 		outline: 1px dotted;
 	}
 
-	&.e-checkbox {
-
-		cursor: pointer;
-		margin-bottom: 6px;
-		margin-left: -2px;
-		padding: 2px;
-
-		&:focus {
-			outline: 1px dotted;
-		}
-
-		&.disabled {
-			cursor: not-allowed;
-			opacity: 0.5;
-		}
-	}
-
 	span {
 		margin-left: 0.5em;
 		white-space: normal;
@@ -69,6 +52,23 @@
 	}
 }
 
+.e-checkbox {
+
+	cursor: pointer;
+	margin-bottom: 6px;
+	margin-left: -2px;
+	padding: 2px;
+
+	&:focus {
+		outline: 1px dotted;
+	}
+
+	&.disabled {
+		cursor: not-allowed;
+		opacity: 0.5;
+	}
+}
+
 .e-checkbox.material-design {
 
 	line-height: 20px;
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 37b2587a1..b713b3a13 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -135,7 +135,6 @@
 
 	.language-buttons {
 		flex-grow: 1;
-		margin-top: 5px;
 		text-align: right;
 	}
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html b/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
deleted file mode 100644
index 35ed4f803..000000000
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div class="e-component e-checkbox" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': !enable() }">
-	<i role="checkbox" class="e-checkbox-icon fontastic" data-bind="text: value() ? '☑' : '☐'"></i>
-<!-- ko if: labeled -->
-	<span data-bind="attr: {'data-i18n': label}"></span>
-<!-- /ko -->
-</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/Login.html b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
index 9a6241534..d662ee127 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/Login.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/Login.html
@@ -25,13 +25,10 @@
 	</div>
 	<div id="plugin-Login-BottomControlGroup"></div>
 	<div class="controls" style="display: flex">
-		<div class="signMeLabel" data-bind="visible: signMeVisibility, component: {
-			name: 'CheckboxSimple',
-			params: {
-				label: 'LOGIN/LABEL_SIGN_ME',
-				value: signMe
-			}
-		}"></div>
+		<div class="e-checkbox" tabindex="0" data-bind="click: function(){signMe(!signMe())}, onSpace: function(){signMe(!signMe())}">
+			<i role="checkbox" class="fontastic" data-bind="text: signMe() ? '☑' : '☐'"></i>
+			<span data-i18n="LOGIN/LABEL_SIGN_ME"></span>
+		</div>
 		<div class="language-buttons">
 			<a href="#" class="language-button fontastic"
 				data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, css: { 'icon-spinner' : langRequest }"