From 6fc2f18c0f308a63ee67e7ae060b6d0a32e77fe4 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 3 Feb 2017 11:40:16 +0100
Subject: [PATCH] clear button moved from custommap
---
frontend-js/src/main/js/map/CustomMap.js | 20 --------------------
frontend-js/src/main/js/minerva.js | 9 +++++++++
frontend-js/src/test/js/helper.js | 4 ++++
web/src/main/webapp/index.xhtml | 4 ++++
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js
index f4a27abf99..322dee81b1 100644
--- a/frontend-js/src/main/js/map/CustomMap.js
+++ b/frontend-js/src/main/js/map/CustomMap.js
@@ -288,26 +288,6 @@ CustomMap.prototype.createMapMenu = function() {
})();
this.divBelt.appendChild(submenuButtonDiv2);
}
-
- var rightHeaderMenu = document.createElement('div');
- rightHeaderMenu.className = "rightHeaderMenu";
-
- var submenuButtonDiv = document.createElement('button');
- submenuButtonDiv.id = "clear_button";
- submenuButtonDiv.className = "overview_button";
- submenuButtonDiv.innerHTML = "<i class='fa fa-times' style='font-size:18px; font-weight:300; padding-right:10px;'></i> CLEAR";
- submenuButtonDiv.title = "Clear all queries";
- submenuButtonDiv.style.display = 'inline';
- submenuButtonDiv.onclick = (function() {
- return function() {
- selfMap.clearData();
- return false;
- };
- })();
- rightHeaderMenu.appendChild(submenuButtonDiv);
-
- this.divBelt.appendChild(rightHeaderMenu);
-
};
CustomMap.prototype.registerSource = function(overlayCollection) {
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index f3efdc5199..1c463a5d8d 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -283,7 +283,16 @@ function create(params) {
return false;
};
})();
+
+ var clearButton = document.getElementsByName("clearButton")[0];
+ clearButton.onclick = (function() {
+ return function() {
+ result.clearData();
+ return false;
+ };
+ })();
+
if (ServerConnector.getSessionData().getShowComments()) {
result.getControl(ControlType.COMMENT_CHECKBOX).checked=true;
return result.refreshComments();
diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js
index 05b1e0d9ce..18d101d871 100644
--- a/frontend-js/src/test/js/helper.js
+++ b/frontend-js/src/test/js/helper.js
@@ -61,6 +61,10 @@ Helper.prototype.createMenuDiv = function() {
refreshCommentButton.setAttribute("name", "refreshCommentButton");
result.appendChild(refreshCommentButton);
+ var clearButton = document.createElement("button");
+ clearButton.setAttribute("name", "clearButton");
+ result.appendChild(clearButton);
+
return result;
};
diff --git a/web/src/main/webapp/index.xhtml b/web/src/main/webapp/index.xhtml
index f66134bb2e..f7208909b3 100644
--- a/web/src/main/webapp/index.xhtml
+++ b/web/src/main/webapp/index.xhtml
@@ -134,6 +134,10 @@ function initMap(){
<i class='fa fa-refresh' style='font-size:21px; font-weight:400;'></i>
</button>
</div>
+ <button name="clearButton" class="overview_button" title="Clear all queries">
+ <i class='fa fa-times' style='font-size:18px; font-weight:300; padding-right:10px;'></i>
+ CLEAR
+ </button>
</div>
</div>
<div id="mapElement" class="mapClass"/>
--
GitLab