From d5fcf4d3c4e4c6e7663ac9997da8572a392e4304 Mon Sep 17 00:00:00 2001
From: Florian Alpers <florian.alpers@intranda.com>
Date: Tue, 15 Dec 2020 15:24:03 +0100
Subject: [PATCH] removed searchField ids

---
 .../resources/components/widgets/widget_searchField.xhtml   | 6 +++---
 .../resources/javascript/dev/modules/viewer/viewerJS.js     | 5 -----
 .../resources/resources/javascript/dist/viewer.min.js       | 5 -----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/widget_searchField.xhtml b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/widget_searchField.xhtml
index bc6c15baacf..5ad3dc175eb 100644
--- a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/widget_searchField.xhtml
+++ b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/widget_searchField.xhtml
@@ -29,7 +29,7 @@
                         	</c:choose>
                             <div class="input-group">
                                 <h:inputText 
-                                    id="searchField" 
+                                	onfocus="this.value=''"
                                     styleClass="form-control -no-outline"
                                     value="#{searchBean.invisibleSearchString}"> 
                                     <f:passThroughAttribute name="placeholder" value="#{cc.attrs.widget.hasWidgetTitle ? msg[cc.attrs.widget.widgetTitle] : msg.search}" />
@@ -38,14 +38,14 @@
                                 <div class="input-group-addon">
                                 	<c:choose>
                                 		<c:when test="#{cc.attrs.widget.hasLinkedPages}">
-	                                        <button id="widgetSearchFieldBtn_cms" class="btn btn-default" aria-label="#{msg.search}" jsf:action="#{cc.attrs.widget.linkedPages.search.searchSimple}">
+	                                        <button class="btn btn-default" aria-label="#{msg.search}" jsf:action="#{cc.attrs.widget.linkedPages.search.searchSimple}">
 	                                            <f:setPropertyActionListener for="actionEvent" target="#{searchBean.activeSearchType}" value="0" />
 	                                            <f:setPropertyActionListener for="actionEvent" target="#{searchBean.facets.currentFacetString}" value="#{cc.attrs.widget.additionalQuery}" />
                                 			<i class="fa fa-search"/>
                                 		</button>
                                 		</c:when>
                                 		<c:otherwise>
-	                                		<button id="widgetSearchFieldBtn" class="btn btn-default" aria-label="#{msg.search}" jsf:action="#{searchBean.searchSimpleSetFacets(cc.attrs.widget.additionalQuery)}">
+	                                		<button class="btn btn-default" aria-label="#{msg.search}" jsf:action="#{searchBean.searchSimpleSetFacets(cc.attrs.widget.additionalQuery)}">
 		                                            <f:setPropertyActionListener for="actionEvent" target="#{searchBean.activeSearchType}" value="0" />
 		                                            <f:setPropertyActionListener for="actionEvent" target="#{searchBean.facets.currentFacetString}" value="#{cc.attrs.widget.additionalQuery}" />
 	                                			<i class="fa fa-search"/>
diff --git a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dev/modules/viewer/viewerJS.js b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dev/modules/viewer/viewerJS.js
index b375f24d9ca..fddc1763462 100644
--- a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dev/modules/viewer/viewerJS.js
+++ b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dev/modules/viewer/viewerJS.js
@@ -178,11 +178,6 @@ var viewerJS = (function () {
             $(href).collapse('show');
         });
 
-        // reset searchfield on focus
-        $('body').on('focus', 'input[id*="searchField"]', function () {
-            $(this).val('');
-        });
-
         // init search drilldown filter
         if (_defaults.activateDrilldownFilter) {
             this.initDrillDownFilters();
diff --git a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dist/viewer.min.js b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dist/viewer.min.js
index d57ad6036ac..523cd655889 100644
--- a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dist/viewer.min.js
+++ b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/javascript/dist/viewer.min.js
@@ -168,11 +168,6 @@
             $(href).collapse('show');
         });
 
-        // reset searchfield on focus
-        $('body').on('focus', 'input[id*="searchField"]', function () {
-            $(this).val('');
-        });
-
         // init search drilldown filter
         if (_defaults.activateDrilldownFilter) {
             this.initDrillDownFilters();