From 3ee32a9f898afbbda7150873c12137e718425db2 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Thu, 12 Jan 2017 14:18:34 +0100
Subject: [PATCH] clear button fixed to clear search results
---
frontend-js/src/main/js/ServerConnector.js | 2 ++
frontend-js/src/main/js/map/CustomMap.js | 6 +++++-
frontend-js/src/main/js/map/overlay/SearchDbOverlay.js | 4 +++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index 7c52cddad0..06a9f5847c 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -362,6 +362,8 @@ ServerConnector.sendClearRequest = function(overlayName) {
} else {
logger.warn("Clear function for " + overlayName + " doesn't exist");
}
+ } else if (overlayName==="search" || overlayName==="comment"){
+ logger.warn("Send clear request for overlay that doesn't support it: "+overlayName);
} else {
throw new Error("[Clear function] Unknown overlay: ", overlayName);
}
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index d9833aa81b..a8db3e2ab3 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -196,7 +196,11 @@ CustomMap.prototype.clearOverlays = function() {
for ( var overlayName in this.overlayCollections) {
if (this.overlayCollections.hasOwnProperty(overlayName)) {
var collection = this.overlayCollections[overlayName];
- this.clearOverlayCollection(collection);
+ if (collection.constructor.name==="OverlayCollection") {
+ this.clearOverlayCollection(collection);
+ }else {
+ collection.clear();
+ }
}
}
};
diff --git a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
index b88672edec..0aa57ad4b1 100644
--- a/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
+++ b/frontend-js/src/main/js/map/overlay/SearchDbOverlay.js
@@ -235,6 +235,8 @@ SearchDbOverlay.prototype.searchByEncodedQuery = function(originalQuery, perfect
}
};
-
+SearchDbOverlay.prototype.clear = function() {
+ return this.searchByQuery("");
+};
module.exports = SearchDbOverlay;
--
GitLab