From 7fa09c5b0371590c42950e834cf18b2cf94e4bc5 Mon Sep 17 00:00:00 2001
From: Mike Lynch <Michael.Lynch@uts.edu.au>
Date: Tue, 3 Mar 2020 16:25:24 +1100
Subject: [PATCH] Text search is now using SearchPath.uri and coming up as a
filter
---
src/components/RegisterEvents.js | 10 ++++------
src/components/views/ListDocs.js | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/components/RegisterEvents.js b/src/components/RegisterEvents.js
index bac88a9..fc3a3b1 100644
--- a/src/components/RegisterEvents.js
+++ b/src/components/RegisterEvents.js
@@ -1,24 +1,22 @@
const delegate = require('./Delegate');
+const SearchPath = require('./SearchPath');
+
const RegisterEvents = function (state) {
delegate('#app', 'click', '#search-text', async () => {
const search = document.querySelector('#text-to-search');
- window.location.hash = `#search/${state.main.start}/${state.main.page}/${search.value}`;
+ window.location.hash = SearchPath.toURI(state.main.currentSearch, { 'main_search': search.value }).substr(1);
});
delegate('#app', 'keyup', '#text-to-search', async (event) => {
if (event.keyCode === 13) {
event.preventDefault();
const search = document.querySelector('#text-to-search');
- window.location.hash = `#search/${state.main.start}/${state.main.page}/${search.value}`;
+ window.location.hash = SearchPath.toURI(state.main.currentSearch, { 'main_search': search.value }).substr(1);
}
});
- delegate('#app', 'click', '#search-text-1', async () => {
- const search = document.querySelector('#text-to-search');
- window.location.hash = `#search/${state.main.start}/${state.main.page}/${search.value}`;
- });
};
module.exports = RegisterEvents;
\ No newline at end of file
diff --git a/src/components/views/ListDocs.js b/src/components/views/ListDocs.js
index b415853..d202dfa 100644
--- a/src/components/views/ListDocs.js
+++ b/src/components/views/ListDocs.js
@@ -16,7 +16,7 @@ const ListDocs = function (data) {
</li>`;
});
} else {
- html += `<div class="text-center"> No data found</div>`;
+ html += `<div class="text-center">No search results</div>`;
}
html += `</ul><div><br/></div>`;
html += `</div></div>`;
--
GitLab