From 1c924e4833d4e3465edab3ad650ce83308a3c37e Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Wed, 6 Mar 2013 11:42:41 +0800
Subject: [PATCH] IDEMPIERE-689 Zk Desktop: The auto collapsed of the left
 panel should be faster and more reliable.

---
 .../adempiere/webui/desktop/DefaultDesktop.java | 17 +++++++++++++----
 .../adempiere/webui/desktop/TabbedDesktop.java  |  5 +++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
index 34e69db8b5..020bf5b69b 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
@@ -30,6 +30,7 @@ import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.apps.BusyDialog;
 import org.adempiere.webui.apps.ProcessDialog;
 import org.adempiere.webui.apps.WReport;
+import org.adempiere.webui.component.Tab;
 import org.adempiere.webui.component.Tabpanel;
 import org.adempiere.webui.component.ToolBarButton;
 import org.adempiere.webui.event.DrillEvent;
@@ -438,14 +439,22 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
 				);
 	}
 
+	//use _docClick undocumented api. need verification after major zk release update
+	private final static String autoHideMenuScript = "try{var w=zk.Widget.$('#{0}');var t=zk.Widget.$('#{1}');" +
+			"var e=new Object;e.target=t;w._docClick(e);}catch(error){}";
+	
 	private void autoHideMenu() {
 		if (layout.getWest().isCollapsible() && !layout.getWest().isOpen())
 		{
 			String id = layout.getWest().getUuid();
-			//$n('colled') is not documented api so this might break in release after 6.0.0
-			String script = "jq(zk.Widget.$('"+id+"').$n('colled')).click();";
-			AuScript aus = new AuScript(layout.getWest(), script);
-			Clients.response("autoHideWest", aus);
+			Tab tab = windowContainer.getSelectedTab();
+			if (tab != null) {
+				String tabId = tab.getUuid();
+				String script = autoHideMenuScript.replace("{0}", id);
+				script = script.replace("{1}", tabId);
+				AuScript aus = new AuScript(layout.getWest(), script);
+				Clients.response("autoHideWest", aus);
+			}			
 		}
 	}
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
index 01fcde9774..06a25d75fb 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java
@@ -169,6 +169,7 @@ public abstract class TabbedDesktop extends AbstractDesktop {
 				runnable.run();
 			}
 		});				
+		preOpenNewTab();
 		Events.echoEvent(new Event("onOpenWindow", tabPanel));
 	}
 
@@ -259,6 +260,7 @@ public abstract class TabbedDesktop extends AbstractDesktop {
 				runnable.run();
 			}
 		});				
+		preOpenNewTab();
 		Events.echoEvent(new Event("onOpenWindow", tabPanel));
 	}
 
@@ -383,8 +385,7 @@ public abstract class TabbedDesktop extends AbstractDesktop {
 		}
 		
 		@Override
-		public void run() {
-			preOpenNewTab();
+		public void run() {			
 			if (adWindow.createPart(tabPanel) != null ) {
 				tab.setImage(null);
 				tab.setClosable(true);