Display instrument list after instrument translations have been downl…

…oaded.
craigsapp · Feb 12, 2022 · 81266e5 · 81266e5
1 parent c00fe64
commit 81266e5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/_includes/browse/buildInstrumentFilter.js b/_includes/browse/buildInstrumentFilter.js
@@ -104,8 +104,8 @@ POPC2.prototype.buildInstrumentFilter = function (index, target) {
 		}
 		output += '>';
 		output += displayInstrument;
-		if (instruments[instrument]) {
-			output += ` (${instruments[instrument]})`;
+		if (instrument.count) {
+			output += ` (${instrument.count})`;
 		}
 		output += "</option>\n";
 	}

diff --git a/_includes/browse/resetBrowseSearchFields.js b/_includes/browse/resetBrowseSearchFields.js
@@ -27,6 +27,7 @@ POPC2.prototype.resetBrowseSearchFields = function () {
 	var composerElement    = document.querySelector("select.filter.composer");
 	var siglumElement      = document.querySelector("select.filter.siglum");
 	var genreElement       = document.querySelector("select.filter.genre");
+	var instrumentElement  = document.querySelector("select.filter.instrument");
 	var nationalityElement = document.querySelector("select.filter.nationality");
 	var titleElement       = document.querySelector("input.filter.title");
 	var lyricsElement      = document.querySelector("input.filter.lyrics");
@@ -46,6 +47,9 @@ POPC2.prototype.resetBrowseSearchFields = function () {
 	if (genreElement) {
 		genreElement.value = "";
 	}
+	if (instrumentElement) {
+		instrumentElement.value = "";
+	}
 	if (tonicElement) {
 		tonicElement.value = "";
 	}

diff --git a/_includes/listeners/downloadInstrumentIndex.js b/_includes/listeners/downloadInstrumentIndex.js
@@ -35,7 +35,7 @@ POPC2.prototype.downloadInstrumentIndex = function () {
 					this.VARS.TRANSLATIONS[entry.TAG] = entry;
 				}
 			}
-
+			that.buildInstrumentFilter();
 			that.DebugMessage("DOWNLOADED INSTRUMENT INDEX FROM " + url, "lightblue");
 		})
 		.catch(err => { console.error("downloadInstrumentIndex:", err); });