From 462af98380dfce751f6368a3e98245c6570d57de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Tue, 24 Aug 2021 17:15:17 +0300
Subject: [PATCH] Restore libraries-to-sync UX. Closes #2156

---
 .../zotero/preferences/librariesToSync.xul    |  7 -------
 .../zotero/preferences/preferences_sync.jsx   | 21 +++++++++++++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/chrome/content/zotero/preferences/librariesToSync.xul b/chrome/content/zotero/preferences/librariesToSync.xul
index 787535ecd1..4b00f30e59 100644
--- a/chrome/content/zotero/preferences/librariesToSync.xul
+++ b/chrome/content/zotero/preferences/librariesToSync.xul
@@ -52,13 +52,6 @@
 		<hbox class="virtualized-table-container" flex="1" height="200" width="600">
 			<html:div id="libraries-to-sync-tree"/>
 		</hbox>
-		<separator class="thin"/>
-
-		<hbox align="center">
-			<hbox pack="start" flex="1">
-				<button label="&zotero.preferences.sync.toggle;" onclick="Zotero_Preferences.Sync.toggleLibraryToSync()"/>
-			</hbox>
-		</hbox>
 	</groupbox>
 	
 	<script>
diff --git a/chrome/content/zotero/preferences/preferences_sync.jsx b/chrome/content/zotero/preferences/preferences_sync.jsx
index 69f0b078eb..66edca436b 100644
--- a/chrome/content/zotero/preferences/preferences_sync.jsx
+++ b/chrome/content/zotero/preferences/preferences_sync.jsx
@@ -234,8 +234,10 @@ Zotero_Preferences.Sync = {
 	},
 	
 	
-	toggleLibraryToSync: function () {
-		const index = this._tree.selection.focused;
+	toggleLibraryToSync: function (index) {
+		if (typeof index != "number") {
+			index = this._tree.selection.focused;
+		}
 		if (index == -1 || !this._rows[index].editable) return;
 		const row = this._rows[index];
 		this._rows[index].checked = !this._rows[index].checked;
@@ -268,7 +270,7 @@ Zotero_Preferences.Sync = {
 			}
 		];
 		this._rows = [];
-		function renderItem(index, selection, oldDiv=null, columns) {
+		let renderItem = (index, selection, oldDiv=null, columns) => {
 			const row = this._rows[index];
 			let div;
 			if (oldDiv) {
@@ -289,6 +291,10 @@ Zotero_Preferences.Sync = {
 						span.innerText = row.checked ? this.checkmarkChar : this.noChar;
 						span.style.textAlign = 'center';
 					}
+					span.addEventListener('mousedown', () => {
+						this.toggleLibraryToSync(index);
+					});
+					span.style.pointerEvents = 'initial';
 					div.appendChild(span);
 				}
 				else {
@@ -297,17 +303,24 @@ Zotero_Preferences.Sync = {
 			}
 			return div;
 		}
+		let handleKeyDown = (e) => {
+			if (e.key == ' ') {
+				this.toggleLibraryToSync();
+				return false;
+			}
+		};
 		let elem = (
 			<IntlProvider locale={Zotero.locale} messages={Zotero.Intl.strings}>
 				<VirtualizedTable
 					getRowCount={() => this._rows.length}
 					id="librariesToSync-table"
 					ref={ref => this._tree = ref}
-					renderItem={renderItem.bind(this)}
+					renderItem={renderItem}
 					showHeader={true}
 					columns={columns}
 					staticColumns={true}
 					onActivate={Zotero_Preferences.Sync.toggleLibraryToSync.bind(this)}
+					onKeyDown={handleKeyDown}
 				/>
 			</IntlProvider>
 		);