From ffb2f641705c1279d741a3f84e8e6f815b2ffa01 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 22 Apr 2021 23:41:26 +0200
Subject: [PATCH] <!-- ko foreach --> to: data-bind=""

---
 .../templates/Views/User/PopupsCompose.html   | 14 ++++-----
 .../Views/User/PopupsComposeOpenPgp.html      | 30 ++++++++-----------
 .../templates/Views/User/SettingsOpenPGP.html | 15 +++-------
 vendors/bootstrap/less/tables.less            |  4 ---
 4 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
index f87d884b5..be21211f8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html
@@ -31,14 +31,12 @@
 								data-bind="text: currentIdentityView, dropdownCloser: true, css: {'multiply': 1 < identitiesOptions().length }">
 							</a>
 							<!-- ko if: 1 < identitiesOptions().length -->
-								<ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="identity-label-id">
-									<!-- ko foreach: identitiesOptions -->
-										<li class="e-item" role="presentation">
-											<a class="e-link menuitem" tabindex="-1" href="javascript:void(0);" data-bind="click: function (oIdentity) { $root.selectIdentity(oIdentity); return true; }">
-												<span data-bind="text: optText"></span>
-											</a>
-										</li>
-									<!-- /ko -->
+								<ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="identity-label-id" data-bind="foreach: identitiesOptions">
+									<li class="e-item" role="presentation">
+										<a class="e-link menuitem" tabindex="-1" href="javascript:void(0);" data-bind="click: function (oIdentity) { $root.selectIdentity(oIdentity); return true; }">
+											<span data-bind="text: optText"></span>
+										</a>
+									</li>
 								</ul>
 							<!-- /ko -->
 						</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
index 056c70a86..b677a25c3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
@@ -48,26 +48,22 @@
 						}"></div>
 
 					<div class="key-list" data-bind="visible: encrypt">
-						<div class="key-list-wrp empty" data-bind="visible: !encryptKeys() || encryptKeys().length === 0">
+						<div class="key-list-wrp empty" data-bind="visible: encryptKeys().length === 0">
 							No public keys selected
 						</div>
-						<div class="key-list-wrp" data-bind="visible: encryptKeys() && encryptKeys().length > 0">
-							<!-- ko foreach: encryptKeys -->
-								<div class="key-list__item">
-									<div class="key-list__item-hash" data-bind="visible: !empty">
-										(<span data-bind="text: hash"></span>)
-									</div>
-									<div class="key-list__item-names"  data-bind="css: {'empty': empty}">
-									<!-- ko foreach: users -->
-										<div class="key-list__item-name" data-bind="text: $data"></div>
-									<!-- /ko -->
-									</div>
-									<div class="key-list__item-error" data-bind="visible: empty">
-										(Public key not found)
-									</div>
-									<div class="key-list__item-delete fontastic" data-bind="click: removable() ? $parent.deletePublickKey : null, css: {'disabled': !removable()}">🗑</div>
+						<div class="key-list-wrp" data-bind="visible: encryptKeys().length > 0, foreach: encryptKeys">
+							<div class="key-list__item">
+								<div class="key-list__item-hash" data-bind="visible: !empty">
+									(<span data-bind="text: hash"></span>)
 								</div>
-							<!-- /ko -->
+								<div class="key-list__item-names"  data-bind="css: {'empty': empty}, foreach: users">
+									<div class="key-list__item-name" data-bind="text: $data"></div>
+								</div>
+								<div class="key-list__item-error" data-bind="visible: empty">
+									(Public key not found)
+								</div>
+								<div class="key-list__item-delete fontastic" data-bind="click: removable() ? $parent.deletePublickKey : null, css: {'disabled': !removable()}">🗑</div>
+							</div>
 						</div>
 					</div>
 				</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
index 2fefbb4c7..f69e82973 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
@@ -33,15 +33,12 @@
 			<col style="width: 1%" />
 			<col style="width: 1%" />
 		</colgroup>
-		<tbody>
-			<!-- ko foreach: openpgpkeysPrivate -->
+		<tbody data-bind="foreach: openpgpkeysPrivate">
 			<tr class="open-pgp-key-item">
 				<td>
 					<span class="open-pgp-key-img fontastic" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">🔒</span>
-					<span class="open-pgp-key-user">
-					<!-- ko foreach: users -->
+					<span class="open-pgp-key-user" data-bind="foreach: users">
 						<div class="open-pgp-key-user-address" data-bind="text: $data"></div>
-					<!-- /ko -->
 					</span>
 					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
@@ -53,17 +50,14 @@
 					<span class="view-open-pgp-key fontastic" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">👁</span>
 				</td>
 			</tr>
-			<!-- /ko -->
-			<!-- ko foreach: openpgpkeysPublic -->
+		</tbody><tbody data-bind="foreach: openpgpkeysPublic">
 			<tr class="open-pgp-key-item">
 				<td>
 					<span class="open-pgp-key-img fontastic" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">🔑</span>
-					<span class="open-pgp-key-user">
-					<!-- ko foreach: users -->
+					<span class="open-pgp-key-user" data-bind="foreach: users">
 						<div class="open-pgp-key-user-address">
 							<span data-bind="text: $data"></span> (<span class="open-pgp-key-id" data-bind="text: $parent.id"></span>)
 						</div>
-					<!-- /ko -->
 					</span>
 					<a class="btn btn-small btn-small-small btn-danger pull-right button-confirm-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
@@ -75,7 +69,6 @@
 					<span class="view-open-pgp-key fontastic" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">👁</span>
 				</td>
 			</tr>
-			<!-- /ko -->
 		</tbody>
 	</table>
 </div>
diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less
index 59a4cee2c..3f4203c43 100644
--- a/vendors/bootstrap/less/tables.less
+++ b/vendors/bootstrap/less/tables.less
@@ -43,10 +43,6 @@
   thead:first-child tr:first-child td {
     border-top: 0;
   }
-  // Account for multiple tbody instances
-  tbody + tbody {
-    border-top: 2px solid @tableBorder;
-  }
 }