refactor selectMultipleWithCtrl to depend on multipleAllowed

Author: LariWa

web/dropdown.ts

@@ -37,7 +37,7 @@ class Dropdown {
 	 * @returns The Dropdown instance.
 	 * @param selectMultipleWithCtrl Select multiple items using Ctrl
 	 */
-	constructor(id: string, showInfo: boolean, multipleAllowed: boolean, dropdownType: string, changeCallback: (values: string[]) => void, selectMultipleWithCtrl: boolean = true) {
+	constructor(id: string, showInfo: boolean, multipleAllowed: boolean, dropdownType: string, changeCallback: (values: string[]) => void, selectMultipleWithCtrl: boolean = false) {
 		this.showInfo = showInfo;
 		this.multipleAllowed = multipleAllowed;
 		this.selectMultipleWithCtrl = selectMultipleWithCtrl;
@@ -64,7 +64,7 @@ class Dropdown {
 		this.currentValueElem = this.elem.appendChild(document.createElement('div'));
 		this.currentValueElem.className = 'dropdownCurrentValue';
 
-		alterClass(this.elem, 'multi', (multipleAllowed || selectMultipleWithCtrl));
+		alterClass(this.elem, 'multi', (multipleAllowed));
 		this.elem.appendChild(this.menuElem);
 
 		document.addEventListener('click', (e) => {
@@ -127,7 +127,7 @@ class Dropdown {
 	 */
 	public isSelected(value: string) {
 		if (this.options.length > 0) {
-			if ((this.multipleAllowed || this.selectMultipleWithCtrl) && this.optionsSelected[0]) {
+			if ((this.multipleAllowed) && this.optionsSelected[0]) {
 				// Multiple options can be selected, and "Show All" is selected.
 				return true;
 			}
@@ -147,7 +147,7 @@ class Dropdown {
 	public selectOption(value: string) {
 		const optionIndex = this.options.findIndex((option) => value === option.value);
 		if (optionIndex < 0 && (this.optionsSelected[0] || this.optionsSelected[optionIndex])) return;
-		if (this.multipleAllowed) {
+		if (this.multipleAllowed && !this.selectMultipleWithCtrl) {
 			// Select the option with the specified value
 			this.optionsSelected[optionIndex] = true;
 		} else {
@@ -173,7 +173,7 @@ class Dropdown {
 	public unselectOption(value: string) {
 		const optionIndex = this.options.findIndex((option) => value === option.value);
 		if (optionIndex < 0 && (this.optionsSelected[0] || this.optionsSelected[optionIndex])) return;
-		if (this.multipleAllowed || this.selectMultipleWithCtrl) {
+		if (this.multipleAllowed) {
 			if (this.optionsSelected[0]) {
 				// Show All is currently selected, so unselect it, and select all branch options
 				this.optionsSelected[0] = false;
@@ -237,7 +237,7 @@ class Dropdown {
 		for (let i = 0; i < this.options.length; i++) {
 			const escapedName = escapeHtml(this.options[i].name);
 			html += '<div class="dropdownOption' + (this.optionsSelected[i] ? ' ' + CLASS_SELECTED : '') + '" data-id="' + i + '" title="' + escapedName + '">' +
-				((this.multipleAllowed || this.selectMultipleWithCtrl) && this.optionsSelected[i] ? '<div class="dropdownOptionMultiSelected">' + SVG_ICONS.check + '</div>' : '') +
+				(this.multipleAllowed && this.optionsSelected[i] ? '<div class="dropdownOptionMultiSelected">' + SVG_ICONS.check + '</div>' : '') +
 				escapedName + (typeof this.options[i].hint === 'string' && this.options[i].hint !== '' ? '<span class="dropdownOptionHint">' + escapeHtml(this.options[i].hint!) + '</span>' : '') +
 				(this.showInfo ? '<div class="dropdownOptionInfo" title="' + escapeHtml(this.options[i].value) + '">' + SVG_ICONS.info + '</div>' : '') +
 				'</div>';
@@ -276,7 +276,7 @@ class Dropdown {
 	 */
 	private getSelectedOptions(names: boolean) {
 		let selected = [];
-		if ((this.multipleAllowed || this.selectMultipleWithCtrl) && this.optionsSelected[0]) {
+		if (this.multipleAllowed && this.optionsSelected[0]) {
 			// Note: Show All is always the first option (0 index) when multiple selected items are allowed
 			return [names ? this.options[0].name : this.options[0].value];
 		}
@@ -295,18 +295,19 @@ class Dropdown {
 		let change = false;
 		let doubleClick = this.doubleClickTimeout !== null && this.lastClicked === option;
 		if (this.doubleClickTimeout !== null) this.clearDoubleClickTimeout();
-
+		// eslint-disable-next-line no-console
+		console.log('test');
 		if (doubleClick) {
 			// Double click
-			if ((this.multipleAllowed || this.selectMultipleWithCtrl) && option === 0) {
+			if ((this.multipleAllowed) && option === 0) {
 				for (let i = 1; i < this.optionsSelected.length; i++) {
 					this.optionsSelected[i] = !this.optionsSelected[i];
 				}
 				change = true;
 			}
 		} else {
 			// Single Click
-			if (this.multipleAllowed || (this.selectMultipleWithCtrl && event && (event.ctrlKey || event.metaKey))) {
+			if (this.multipleAllowed && (!this.selectMultipleWithCtrl || (event && (event.ctrlKey || event.metaKey)))) {
 				// Multiple dropdown options can be selected
 				if (option === 0) {
 					// Show All was selected

web/main.ts

@@ -86,20 +86,20 @@ class GitGraphView {
 			this.loadRepo(values[0]);
 		});
 
-		this.branchDropdown = new Dropdown('branchDropdown', false, this.config.selectMultipleBranches, 'Branches', (values) => {
+		this.branchDropdown = new Dropdown('branchDropdown', false, true, 'Branches', (values) => {
 			this.currentBranches = values;
 			this.maxCommits = this.config.initialLoadCommits;
 			this.saveState();
 			this.clearCommits();
 			this.requestLoadRepoInfoAndCommits(true, true);
-		});
-		this.authorDropdown = new Dropdown('authorDropdown', false, this.config.selectMultipleAuthors, 'Authors', (values) => {
+		}, !this.config.selectMultipleBranches);
+		this.authorDropdown = new Dropdown('authorDropdown', false, true, 'Authors', (values) => {
 			this.currentAuthors = values;
 			this.maxCommits = this.config.initialLoadCommits;
 			this.saveState();
 			this.clearCommits();
 			this.requestLoadRepoInfoAndCommits(true, true);
-		});
+		}, !this.config.selectMultipleAuthors);
 		this.showRemoteBranchesElem = <HTMLInputElement>document.getElementById('showRemoteBranchesCheckbox')!;
 		this.showRemoteBranchesElem.addEventListener('change', () => {
 			this.saveRepoStateValue(this.currentRepo, 'showRemoteBranchesV2', this.showRemoteBranchesElem.checked ? GG.BooleanOverride.Enabled : GG.BooleanOverride.Disabled);