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

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 b464482f4bfb9bcae01b6d44730c8bb116f8d026..7dcefbadb3244b181821cc270a72f9e1c59cec98 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
@@ -263,6 +263,13 @@ public class SearchModel extends AsyncBaseModel {
                                Clients.scrollIntoView(top);\r
                                logger.info("Scrolled into the {}. row on the page.", pos);\r
                        }\r
+\r
+                       if (positionToScroll > -1) {\r
+                               highlight(selectedObject, true);\r
+                               positionToScroll = -1;\r
+                       }\r
+\r
+                       preventAfterRender = false;\r
                });\r
                timer.start();\r
        }\r
@@ -441,30 +448,27 @@ public class SearchModel extends AsyncBaseModel {
 \r
        @Command\r
        public void onAfterRenderGrid() {\r
-               logger.info("onAfterRenderGrid");\r
-               if (!preventAfterRender) {\r
-                       preventAfterRender = false;\r
-                       return;\r
-               }\r
                String mediaID = SessionUtil.getQueryParameter(MEDIA_ID);\r
                if (mediaID != null) {\r
                        selectedObject = searchResult.getElementAt(0);\r
                        highlight(selectedObject, true);\r
                        notifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");\r
+                       return;\r
                }\r
+\r
+               if (preventAfterRender)\r
+                       return;\r
+               preventAfterRender = true;\r
+               logger.info("onAfterRenderGrid");\r
                if (positionToScroll != -1) {\r
                        ensureVisible(positionToScroll);\r
-                       highlight(selectedObject, true);\r
-                       positionToScroll = -1;\r
                } else\r
                        ensureVisible(itemsGrid.getPageSize() * itemsGrid.getActivePage());\r
-               preventAfterRender = false;\r
        }\r
 \r
        @Command\r
        public void onPaging() {\r
                logger.info("onPaging");\r
-               preventAfterRender = true;\r
        }\r
 \r
        @Command\r
@@ -584,7 +588,7 @@ public class SearchModel extends AsyncBaseModel {
                        return;\r
                int activePageIndex = selectedRowIndex / itemsGrid.getPageSize();\r
                positionToScroll = selectedRowIndex - itemsGrid.getPageSize() * activePageIndex;\r
-               preventAfterRender = true;\r
+               //preventAfterRender = true;\r
                if (activePageIndex != itemsGrid.getActivePage()) {\r
                        itemsGrid.setActivePage(activePageIndex);\r
                        logger.info("Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", activePageIndex + 1);\r