Implementation for issue #267

craigsapp · Feb 11, 2024 · 07983dd · 07983dd
1 parent 465037e
commit 07983dd
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 15 deletions.
diff --git a/_includes/browse/filterByCentury.js b/_includes/browse/filterByCentury.js
@@ -29,7 +29,8 @@ POPC2.prototype.filterByCentury = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.y = target.trim();
 		let output = [];
 		let re = new RegExp("^" + target);
 		for (let i=0; i<input.length; i++) {

diff --git a/_includes/browse/filterByComposer.js b/_includes/browse/filterByComposer.js
@@ -35,8 +35,8 @@ POPC2.prototype.filterByComposer = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH.composer = target;
-		this.VARS.SEARCH_URL.c = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.c = target.trim();
 
 		if ((input.length == this.VARS.SEARCH_INDEX.length)
 				&& !this.IsEmptyObject(this.VARS.COMPOSER_INDEX)) {
@@ -48,7 +48,6 @@ POPC2.prototype.filterByComposer = function (input) {
 			}
 		}
 
-		this.VARS.SEARCH[type] = target;
 		let output = [];
 		for (let i=0; i<input.length; i++) {
 			let entry = input[i];

diff --git a/_includes/browse/filterByGenre.js b/_includes/browse/filterByGenre.js
@@ -29,7 +29,8 @@ POPC2.prototype.filterByGenre = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.g = target.trim();
 		let output = [];
 		let re = new RegExp("\\b" + target + "\\b");
 		for (let i=0; i<input.length; i++) {

diff --git a/_includes/browse/filterByInstrument.js b/_includes/browse/filterByInstrument.js
@@ -29,7 +29,8 @@ POPC2.prototype.filterByInstrument = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.i = target.trim();
 		let output = [];
 		let re = new RegExp("\\b" + target + "\\b");
 		for (let i=0; i<input.length; i++) {

diff --git a/_includes/browse/filterByLyrics.js b/_includes/browse/filterByLyrics.js
@@ -52,7 +52,8 @@ POPC2.prototype.filterByLyrics = function (input) {
 	}
 
 	if (lyricsTargets.length > 0) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.l = target.trim();
 		let output = [];
 		for (let i=0; i<lyricsTargets.length; i++) {
 			let negate = false;

diff --git a/_includes/browse/filterByMode.js b/_includes/browse/filterByMode.js
@@ -29,7 +29,8 @@ POPC2.prototype.filterByMode = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.m = target.trim();
 		let output = [];
 		let re;
 		if (target === "maj") {

diff --git a/_includes/browse/filterByNationality.js b/_includes/browse/filterByNationality.js
@@ -29,7 +29,8 @@ POPC2.prototype.filterByNationality = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.n = target.trim();
 		let output = [];
 		let re = new RegExp("\\b" + target + "\\b");
 		for (let i=0; i<input.length; i++) {

diff --git a/_includes/browse/filterByPitch.js b/_includes/browse/filterByPitch.js
@@ -34,7 +34,8 @@ POPC2.prototype.filterByPitch = function (input) {
 	let clean = this.sanitizePitchQuery(target);
 
 	if (clean.length > 0) {
-		this.VARS.SEARCH[type] = dirty;
+		this.VARS.SEARCH[type] = dirty.trim();
+		this.VARS.SEARCH_URL.p = dirty.trim();
 		let output = [];
 		let re = new RegExp(clean, "i");
 		for (let i=0; i<input.length; i++) {

diff --git a/_includes/browse/filterBySiglum.js b/_includes/browse/filterBySiglum.js
@@ -29,10 +29,9 @@ POPC2.prototype.filterBySiglum = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH.siglum = target;
-		this.VARS.SEARCH_URL.s = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.s = target.trim();
 
-		this.VARS.SEARCH[type] = target;
 		let output = [];
 		let re = new RegExp("^" + target + "$");
 		for (let i=0; i<input.length; i++) {

diff --git a/_includes/browse/filterByTitle.js b/_includes/browse/filterByTitle.js
@@ -36,7 +36,8 @@ POPC2.prototype.filterByTitle = function (input) {
 
 	target = target.trim();
 	if (target) {
-		this.VARS.SEARCH_URL.t = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.t = target.trim();
 	}
 	let pieces = target.replace(/-"/g, '"-').split(/\s*"+\s*/);
 	let titleTargets = [];

diff --git a/_includes/browse/filterByTonic.js b/_includes/browse/filterByTonic.js
@@ -29,7 +29,9 @@ POPC2.prototype.filterByTonic = function (input) {
 		target = element.value;
 	}
 	if (target) {
-		this.VARS.SEARCH[type] = target;
+		this.VARS.SEARCH[type] = target.trim();
+		this.VARS.SEARCH_URL.k = target.trim()
+
 		let output = [];
 		let re = new RegExp("^" + target, "i");
 		for (let i=0; i<input.length; i++) {