From 78122e875b89897ff26cd47263c5e3ff4c49284f Mon Sep 17 00:00:00 2001
From: =?utf8?q?M=C3=A1rk=20M=C3=A9r=C3=A9sz?= <USER\mark.meresz>
Date: Mon, 23 Jul 2018 12:27:19 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31212

---
 .../pages/searchitems.zul                     | 44 ++++++++++++++++++-
 .../user/jobengine/zk/model/SearchModel.java  |  9 ++++
 .../zk/util/LogEventInterceptor.java          |  8 ++--
 3 files changed, 56 insertions(+), 5 deletions(-)
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 2adf66ec..99779b4b 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -5,6 +5,19 @@
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
 
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+	<script type="text/javascript">
+		function clearSelection () {
+			if(window.getSelection) {
+				if (window.getSelection().empty) {  // Chrome
+					 window.getSelection().empty();
+				} else if (window.getSelection().removeAllRanges) {  // Firefox
+					 window.getSelection().removeAllRanges();
+				 }
+			} else if (document.selection) {  // IE?
+				document.selection.empty();
+			}
+		}
+	</script>
 	<!-- csak igy jo a list sebessege -->
 	<custom-attributes org.zkoss.zul.listbox.rod="true" />
 	<!-- 	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" /> -->
@@ -91,11 +104,33 @@
 							</hbox>
 						</vlayout>
 						<hbox width="100%" pack="center" align="left">
-							<combobox id="search" hflex="1" focus="true" model="@load(vm.searchHistory)" autodrop="true" buttonVisible="false"
+							<combobox id="search" sclass="search" hflex="1" focus="true" model="@load(vm.searchHistory)"  autodrop="true" buttonVisible="false"
 								tooltiptext="GÃ©pelje be a keresendÅ kifejezÃ©st Ã©s nyomja meg az Enter-t." onOK="@command('doSearch')">
+								<attribute w:name="_doKeyDown">
+									
+									<![CDATA[ 
+									          function (evt) {
+									        	  var keyCode = evt.keyCode;
+									        	  if (keyCode !=13) {
+									        		  this.$_doKeyDown(evt);
+									        	  } else{
+									        		  if(window.getSelection) {
+									        			  if (window.getSelection().empty) {  // Chrome
+									        			    window.getSelection().empty();
+									        			  } else if (window.getSelection().removeAllRanges) {  // Firefox
+									        			    window.getSelection().removeAllRanges();
+									        			  }
+									        			} else if (document.selection) {  // IE?
+									        			  document.selection.empty();
+									        			}
+									        	  } 
+									          } ]]>
+								</attribute>
 								<template name="model">
 									<comboitem label="${each}" />
 								</template>
+
+
 							</combobox>
 							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
 							<button dir="reverse" image="/img/baseline_expand_more_black_18dp.png" popup="searchSettings, after_start" iconSclass="caret">
@@ -122,6 +157,9 @@
 						<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
 							model="@load(vm.searchResult)" emptyMessage="Nincs talÃ¡lat!" pageSize="50" onAfterRender="@command('onAfterRenderGrid')"
 							style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">
+							<attribute name="onAfterRender">
+									Clients.evalJavaScript("clearSelection();");
+								</attribute>
 							<columns id="orderColumns">
 								<column hflex="min">
 									<checkbox checked="@bind(vm.rowsExpanded)" />
@@ -152,9 +190,13 @@
 														<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />
 													</hlayout>
 													<html sclass="relevant">
+
+
 														
 														<![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>
 														
+														
+														
 													</html>
 												</div>
 											</hlayout>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 581446a4..469c624e 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -23,6 +23,7 @@ import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.KeyEvent;
 import org.zkoss.zk.ui.event.MouseEvent;
 import org.zkoss.zk.ui.event.SortEvent;
 import org.zkoss.zk.ui.select.Selectors;
@@ -237,6 +238,8 @@ public class SearchModel extends AsyncBaseModel {
 	@NotifyChange({ "searchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile", "lowresMediaFilePath" })
 	public void doSearch() {
 		try {
+			search.close();
+			search.select();
 			searchResult = null;
 			itemsGrid.setActivePage(0);
 			searchValue = search.getText();
@@ -481,6 +484,12 @@ public class SearchModel extends AsyncBaseModel {
 			ensureVisible(itemsGrid.getPageSize() * itemsGrid.getActivePage());
 	}
 
+	@Command
+	public void onChangingCombo(@ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {
+		logger.info(((KeyEvent) ctx.getTriggerEvent()).getKeyCode());
+		logger.info("onChanging");
+	}
+
 	@Command
 	public void onPaging() {
 		logger.info("onPaging");
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java
index 91fd3c83..74b68f81 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java
@@ -10,25 +10,25 @@ public class LogEventInterceptor implements EventInterceptor {
 
 	@Override
 	public void afterProcessEvent(Event event) {
-		logger.info("afterProcessEvent {}", event.getName());
+		logger.info("afterProcessEvent {} {}", event.getTarget(), event.getName());
 
 	}
 
 	@Override
 	public Event beforePostEvent(Event event) {
-		//		logger.info("beforePostEvent {}", event.getName());
+		// logger.info("beforePostEvent {}", event.getName());
 		return event;
 	}
 
 	@Override
 	public Event beforeProcessEvent(Event event) {
-		//		logger.info("beforeProcessEvent {}", event.getName());
+		// logger.info("beforeProcessEvent {}", event.getName());
 		return event;
 	}
 
 	@Override
 	public Event beforeSendEvent(Event event) {
-		//		logger.info("beforeSendEvent {}", event.getName());
+		// logger.info("beforeSendEvent {}", event.getName());
 		return event;
 	}
 }
\ No newline at end of file
-- 
2.54.0

