From 6f2cc899d4bd881f39bd1dde5770a035fc70feac Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Tue, 13 Oct 2020 22:15:15 +0800
Subject: [PATCH] IDEMPIERE-4477 Upgrade to Zk 9.5.0 (#290)

---
 org.adempiere.ui.zk/index.zul                 |  2 +-
 .../theme/default/css/fragment/tree.css.dsp   | 15 ++++++
 .../org.idempiere.p2.targetplatform.target    | 50 +++++++++----------
 org.idempiere.parent/pom.xml                  |  2 +-
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/org.adempiere.ui.zk/index.zul b/org.adempiere.ui.zk/index.zul
index b632a9c35f..437405d006 100644
--- a/org.adempiere.ui.zk/index.zul
+++ b/org.adempiere.ui.zk/index.zul
@@ -61,7 +61,7 @@ Copyright (C) 2007 Ashley G Ramdass.
 		});
 			
 		zk.afterLoad(function() {
-			jq(window).unload(function () {
+			jq(window).on("unload", function () {
 				//rmDesktop not call in window.onbeforeunload (mount.js) when zk.confirmClose is not null								
 				if (!zk.ie && zk.confirmClose){						
 					rmDesktop();
diff --git a/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp b/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
index 05dca56dca..d3491af512 100644
--- a/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
+++ b/org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
@@ -14,4 +14,19 @@
 }
 .tree-moveitem-btn.pressed {
 	box-shadow: inset 0 0 0 1px #efefef,inset 0 3px 15px #9f9f9f;
+}
+
+.z-treerow > .z-treecell > .z-treecell-content > .z-tree-line.z-tree-spacer:first-child {
+	width:0px;
+}
+.z-treerow > .z-treecell > .z-treecell-content > .z-tree-line.z-tree-spacer + .z-tree-icon {
+	width: 30px;
+}
+.z-treerow > .z-treecell > .z-treecell-content > .z-tree-line.z-tree-spacer + .z-tree-icon::before {
+	content: " ";
+	display: inline-block;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index f10fe76a37..fccd109eb6 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="idempiere-201003" sequenceNumber="111">
+<target name="idempiere-201008" sequenceNumber="112">
 <locations>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 		<repository location="https://idempiere.github.io/binary.file/p2.maven/org.idempiere.webservice.client-p2-R20190412"/>
@@ -411,30 +411,30 @@
 		<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-		<repository location="https://idempiere.github.io/binary.file/p2.zk/9.0.1.2"/>
-		<unit id="zcommon" version="9.0.1.2"/>
-		<unit id="zcommon.source" version="9.0.1.2"/>
-		<unit id="zel" version="9.0.1.2"/>
-		<unit id="zel.source" version="9.0.1.2"/>
-		<unit id="zhtml" version="9.0.1.2"/>
-		<unit id="zhtml.source" version="9.0.1.2"/>
-		<unit id="zjavassist" version="9.0.1.2"/>
-		<unit id="zk" version="9.0.1.2"/>
-		<unit id="zk.source" version="9.0.1.2"/>
-		<unit id="zkbind" version="9.0.1.2"/>
-		<unit id="zkbind.source" version="9.0.1.2"/>
-		<unit id="zkplus" version="9.0.1.2"/>
-		<unit id="zkplus-legacy" version="9.0.1.2"/>
-		<unit id="zkplus-legacy.source" version="9.0.1.2"/>
-		<unit id="zkplus.source" version="9.0.1.2"/>
-		<unit id="zkwebfragment" version="9.0.1.2"/>
-		<unit id="zkwebfragment.source" version="9.0.1.2"/>
-		<unit id="zul" version="9.0.1.2"/>
-		<unit id="zul.source" version="9.0.1.2"/>
-		<unit id="zweb" version="9.0.1.2"/>
-		<unit id="zweb-dsp" version="9.0.1.2"/>
-		<unit id="zweb-dsp.source" version="9.0.1.2"/>
-		<unit id="zweb.source" version="9.0.1.2"/>
+		<repository location="https://idempiere.github.io/binary.file/p2.zk/9.5.0"/>				
+		<unit id="zcommon" version="9.5.0"/>
+		<unit id="zcommon.source" version="9.5.0"/>
+		<unit id="zel" version="9.5.0"/>
+		<unit id="zel.source" version="9.5.0"/>
+		<unit id="zhtml" version="9.5.0"/>
+		<unit id="zhtml.source" version="9.5.0"/>
+		<unit id="zjavassist" version="9.5.0"/>
+		<unit id="zk" version="9.5.0"/>
+		<unit id="zk.source" version="9.5.0"/>
+		<unit id="zkbind" version="9.5.0"/>
+		<unit id="zkbind.source" version="9.5.0"/>
+		<unit id="zkplus" version="9.5.0"/>
+		<unit id="zkplus-legacy" version="9.5.0"/>
+		<unit id="zkplus-legacy.source" version="9.5.0"/>
+		<unit id="zkplus.source" version="9.5.0"/>
+		<unit id="zkwebfragment" version="9.5.0"/>
+		<unit id="zkwebfragment.source" version="9.5.0"/>
+		<unit id="zul" version="9.5.0"/>
+		<unit id="zul.source" version="9.5.0"/>
+		<unit id="zweb" version="9.5.0"/>
+		<unit id="zweb-dsp" version="9.5.0"/>
+		<unit id="zweb-dsp.source" version="9.5.0"/>
+		<unit id="zweb.source" version="9.5.0"/>
 	</location>
 	<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 		<repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20200519/"/>
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index 31c341ebf9..ce1b6c690c 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -15,7 +15,7 @@
 		<tycho.extras.version>${tycho.version}</tycho.extras.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jp.version>6.11.0</jp.version>
-		<zk.version>9.0.1.2</zk.version>
+		<zk.version>9.5.0</zk.version>
 		<zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version>
 		<maven.dependency.version>3.1.1</maven.dependency.version>
 		<download.maven.version>1.4.1</download.maven.version>