From c3ae09f53943717467756d92f4d5c5def2ff0f7b Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 19 Jan 2015 10:08:49 +0800
Subject: [PATCH] IDEMPIERE-2114 Session is not closed when closing the tab.
 Integrate patch from hieplq.

---
 org.adempiere.ui.zk/index.zul | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/org.adempiere.ui.zk/index.zul b/org.adempiere.ui.zk/index.zul
index 2da1b0e688..5075d86ee5 100644
--- a/org.adempiere.ui.zk/index.zul
+++ b/org.adempiere.ui.zk/index.zul
@@ -11,12 +11,35 @@ Copyright (C) 2007 Ashley G Ramdass.
 <?link rel="stylesheet" type="text/css" href="${themeStyleSheetByBrowser}"?>
 <?link rel="stylesheet" type="text/css" href="css/PAPanel.css"?>
 <zk>
-	<script>
+	<script><![CDATA[
 		zk.afterLoad(function() {
 			zk._Erbx.push = function(msg) {
 				if (console) console.log(msg);
 			}
 		});
+			
+		zk.afterLoad(function() {
+			jq(window).unload(function () {
+				//rmDesktop not call in window.onbeforeunload (mount.js) when zk.confirmClose is not null								
+				if (!zk.ie && zk.confirmClose){						
+					rmDesktop();
+				} 
+			});						
+			
+			//function rmDesktop duplicated from mount.js ( zk.jar 7.0.3 )
+			function rmDesktop() {
+				var bRmDesktop = !zk.opera && !zk.keepDesktop;
+				if (bRmDesktop || zk.pfmeter) {
+					try {
+						var dts = zk.Desktop.all;
+						for (var dtid in dts)
+							zAu._rmDesktop(dts[dtid], !bRmDesktop);
+					} catch (e) { 
+					}
+				}
+			}
+		});								
+	]]>
 	</script>
     <include src="${themePreference}"/>
 	<window use="org.adempiere.webui.AdempiereWebUI"/>