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

diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
index f8e45c0e5ea44df6d77024ad45ee8ffbed5b177e..b327879705ae93155090e51330223e0f5754c3ef 100644 (file)
--- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
+<!-- \r
+\r
+https://www.zkoss.org/wiki/ZK_Configuration_Reference/zk.xml\r
+\r
+ -->\r
+\r
 <zk>\r
        <library-property>\r
            <name>org.zkoss.web.preferred.locale</name>\r

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index b9b484fe4dba9f66268417e366d7a42d28caf570..ce2e8b40bf942cf42442a906c5ec94133c451345 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -62,7 +62,7 @@
                .z-messagebox-window{ top:40% !important; width:30% !important; }\r
        </style>\r
        <div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">\r
-               <timer id="timer" delay="500" repeats="true" onTimer="@command('uiTick')" />\r
+               <timer id="timer" delay="1" repeats="false" onTimer="@command('uiTick')" />\r
                <borderlayout>\r
                        <west border="none" size="60%" splittable="true" minsize="500">\r
                                <div height="100%" width="100%">\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 93fb1c0ab887a9fd02322d46bbdf69b63a4d1b60..4c1ae264daf0f98e72b020e94ade976e4b45ff10 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
@@ -36,7 +36,7 @@ import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hlayout;\r
 import org.zkoss.zul.Messagebox;\r
 import org.zkoss.zul.Row;\r
-import org.zkoss.zul.Rows;\r
+import org.zkoss.zul.Timer;\r
 import org.zkoss.zul.Window;\r
 \r
 import user.commons.ListUtils;\r
@@ -78,7 +78,7 @@ public class SearchModel extends AsyncBaseModel {
        private boolean allSelected;\r
        private boolean itemSelected;\r
        @Wire\r
-       Rows rows;\r
+       Timer timer;\r
        @Wire\r
        Grid itemsGrid;\r
        private String orderBy;\r
@@ -381,13 +381,14 @@ public class SearchModel extends AsyncBaseModel {
        public void onAfterRenderGrid() {\r
                registerTask(() -> {\r
                        logger.info("onAfterRenderGrid");\r
-                       List<Component> children = rows.getChildren();\r
+                       List<Component> children = itemsGrid.getRows().getChildren();\r
                        if (children.size() > 0) {\r
                                int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage();\r
                                Component top = children.get(pos);\r
                                Clients.scrollIntoView(top);\r
                        }\r
                });\r
+               timer.start();\r
        }\r
 \r
        @Command\r
@@ -483,5 +484,6 @@ public class SearchModel extends AsyncBaseModel {
                        allChecked = check[0];\r
                        notifyChange("allChecked");\r
                });\r
+               timer.start();\r
        }\r
 }\r