From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Tue, 17 Jul 2018 14:57:40 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=0890d500ee44d64f63bf72d63b7c1aadb490213c;p=mediacube.git

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

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