git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 2adf66ec3a3ee0a018a9090e9698dc2f4ecf3011..99779b4bafa08839473c563f3a9007fdc2f37bbf 100644 (file)
--- 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"?>\r
 \r
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">\r
+       <script type="text/javascript">\r
+               function clearSelection () {\r
+                       if(window.getSelection) {\r
+                               if (window.getSelection().empty) {  // Chrome\r
+                                        window.getSelection().empty();\r
+                               } else if (window.getSelection().removeAllRanges) {  // Firefox\r
+                                        window.getSelection().removeAllRanges();\r
+                                }\r
+                       } else if (document.selection) {  // IE?\r
+                               document.selection.empty();\r
+                       }\r
+               }\r
+       </script>\r
        <!-- csak igy jo a list sebessege -->\r
        <custom-attributes org.zkoss.zul.listbox.rod="true" />\r
        <!--    <custom-attributes org.zkoss.zul.listbox.initRodSize="50" /> -->\r
@@ -91,11 +104,33 @@
                                                        </hbox>\r
                                                </vlayout>\r
                                                <hbox width="100%" pack="center" align="left">\r
-                                                       <combobox id="search" hflex="1" focus="true" model="@load(vm.searchHistory)" autodrop="true" buttonVisible="false"\r
+                                                       <combobox id="search" sclass="search" hflex="1" focus="true" model="@load(vm.searchHistory)"  autodrop="true" buttonVisible="false"\r
                                                                tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')">\r
+                                                               <attribute w:name="_doKeyDown">\r
+                                                                       \r
+                                                                       <![CDATA[ \r
+                                                                                 function (evt) {\r
+                                                                                         var keyCode = evt.keyCode;\r
+                                                                                         if (keyCode !=13) {\r
+                                                                                                 this.$_doKeyDown(evt);\r
+                                                                                         } else{\r
+                                                                                                 if(window.getSelection) {\r
+                                                                                                         if (window.getSelection().empty) {  // Chrome\r
+                                                                                                           window.getSelection().empty();\r
+                                                                                                         } else if (window.getSelection().removeAllRanges) {  // Firefox\r
+                                                                                                           window.getSelection().removeAllRanges();\r
+                                                                                                         }\r
+                                                                                                       } else if (document.selection) {  // IE?\r
+                                                                                                         document.selection.empty();\r
+                                                                                                       }\r
+                                                                                         } \r
+                                                                                 } ]]>\r
+                                                               </attribute>\r
                                                                <template name="model">\r
                                                                        <comboitem label="${each}" />\r
                                                                </template>\r
+\r
+\r
                                                        </combobox>\r
                                                        <button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />\r
                                                        <button dir="reverse" image="/img/baseline_expand_more_black_18dp.png" popup="searchSettings, after_start" iconSclass="caret">\r
@@ -122,6 +157,9 @@
                                                <grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"\r
                                                        model="@load(vm.searchResult)" emptyMessage="Nincs találat!" pageSize="50" onAfterRender="@command('onAfterRenderGrid')"\r
                                                        style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">\r
+                                                       <attribute name="onAfterRender">\r
+                                                                       Clients.evalJavaScript("clearSelection();");\r
+                                                               </attribute>\r
                                                        <columns id="orderColumns">\r
                                                                <column hflex="min">\r
                                                                        <checkbox checked="@bind(vm.rowsExpanded)" />\r
@@ -152,9 +190,13 @@
                                                                                                                <label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />\r
                                                                                                        </hlayout>\r
                                                                                                        <html sclass="relevant">\r
+\r
+\r
                                                                                                                \r
                                                                                                                <![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>\r
                                                                                                                \r
+                                                                                                               \r
+                                                                                                               \r
                                                                                                        </html>\r
                                                                                                </div>\r
                                                                                        </hlayout>\r

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 581446a49769c9c2d851e2fa26cd3351924dfb6b..469c624e1e147d42b21dc23d068bf4d4f7914e2f 100644 (file)
--- 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;\r
 import org.zkoss.zk.ui.Executions;\r
 import org.zkoss.zk.ui.event.Event;\r
+import org.zkoss.zk.ui.event.KeyEvent;\r
 import org.zkoss.zk.ui.event.MouseEvent;\r
 import org.zkoss.zk.ui.event.SortEvent;\r
 import org.zkoss.zk.ui.select.Selectors;\r
@@ -237,6 +238,8 @@ public class SearchModel extends AsyncBaseModel {
        @NotifyChange({ "searchResult", "selectedObject", "hasTSMMediaFile", "hasLowresMediaFile", "lowresMediaFilePath" })\r
        public void doSearch() {\r
                try {\r
+                       search.close();\r
+                       search.select();\r
                        searchResult = null;\r
                        itemsGrid.setActivePage(0);\r
                        searchValue = search.getText();\r
@@ -481,6 +484,12 @@ public class SearchModel extends AsyncBaseModel {
                        ensureVisible(itemsGrid.getPageSize() * itemsGrid.getActivePage());\r
        }\r
 \r
+       @Command\r
+       public void onChangingCombo(@ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {\r
+               logger.info(((KeyEvent) ctx.getTriggerEvent()).getKeyCode());\r
+               logger.info("onChanging");\r
+       }\r
+\r
        @Command\r
        public void onPaging() {\r
                logger.info("onPaging");\r

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 91fd3c833f1f26e85893a3612309c3638ca8ac49..74b68f81694cfef20487f411e73f49cebc2239c4 100644 (file)
--- 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 {
 \r
        @Override\r
        public void afterProcessEvent(Event event) {\r
-               logger.info("afterProcessEvent {}", event.getName());\r
+               logger.info("afterProcessEvent {} {}", event.getTarget(), event.getName());\r
 \r
        }\r
 \r
        @Override\r
        public Event beforePostEvent(Event event) {\r
-               //              logger.info("beforePostEvent {}", event.getName());\r
+               // logger.info("beforePostEvent {}", event.getName());\r
                return event;\r
        }\r
 \r
        @Override\r
        public Event beforeProcessEvent(Event event) {\r
-               //              logger.info("beforeProcessEvent {}", event.getName());\r
+               // logger.info("beforeProcessEvent {}", event.getName());\r
                return event;\r
        }\r
 \r
        @Override\r
        public Event beforeSendEvent(Event event) {\r
-               //              logger.info("beforeSendEvent {}", event.getName());\r
+               // logger.info("beforeSendEvent {}", event.getName());\r
                return event;\r
        }\r
 }
\ No newline at end of file