midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4477 Upgrade to Zk 9.5.0 (#290)

This commit is contained in:
hengsin 2020-10-13 22:15:15 +08:00 committed by GitHub
parent 5a83afb565
commit 6f2cc899d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/index.zul
View File

@ -61,7 +61,7 @@ Copyright (C) 2007 Ashley G Ramdass.
}); });
zk.afterLoad(function() { 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 //rmDesktop not call in window.onbeforeunload (mount.js) when zk.confirmClose is not null
if (!zk.ie && zk.confirmClose){ if (!zk.ie && zk.confirmClose){
rmDesktop(); rmDesktop();

15
org.adempiere.ui.zk/theme/default/css/fragment/tree.css.dsp
View File

@ -15,3 +15,18 @@
.tree-moveitem-btn.pressed { .tree-moveitem-btn.pressed {
box-shadow: inset 0 0 0 1px #efefef,inset 0 3px 15px #9f9f9f; 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;
}

50
org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?>
<target name="idempiere-201003" sequenceNumber="111"> <target name="idempiere-201008" sequenceNumber="112">
<locations> <locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <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"/> <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"/> <unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
</location> </location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <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"/> <repository location="https://idempiere.github.io/binary.file/p2.zk/9.5.0"/>
<unit id="zcommon" version="9.0.1.2"/> <unit id="zcommon" version="9.5.0"/>
<unit id="zcommon.source" version="9.0.1.2"/> <unit id="zcommon.source" version="9.5.0"/>
<unit id="zel" version="9.0.1.2"/> <unit id="zel" version="9.5.0"/>
<unit id="zel.source" version="9.0.1.2"/> <unit id="zel.source" version="9.5.0"/>
<unit id="zhtml" version="9.0.1.2"/> <unit id="zhtml" version="9.5.0"/>
<unit id="zhtml.source" version="9.0.1.2"/> <unit id="zhtml.source" version="9.5.0"/>
<unit id="zjavassist" version="9.0.1.2"/> <unit id="zjavassist" version="9.5.0"/>
<unit id="zk" version="9.0.1.2"/> <unit id="zk" version="9.5.0"/>
<unit id="zk.source" version="9.0.1.2"/> <unit id="zk.source" version="9.5.0"/>
<unit id="zkbind" version="9.0.1.2"/> <unit id="zkbind" version="9.5.0"/>
<unit id="zkbind.source" version="9.0.1.2"/> <unit id="zkbind.source" version="9.5.0"/>
<unit id="zkplus" version="9.0.1.2"/> <unit id="zkplus" version="9.5.0"/>
<unit id="zkplus-legacy" version="9.0.1.2"/> <unit id="zkplus-legacy" version="9.5.0"/>
<unit id="zkplus-legacy.source" version="9.0.1.2"/> <unit id="zkplus-legacy.source" version="9.5.0"/>
<unit id="zkplus.source" version="9.0.1.2"/> <unit id="zkplus.source" version="9.5.0"/>
<unit id="zkwebfragment" version="9.0.1.2"/> <unit id="zkwebfragment" version="9.5.0"/>
<unit id="zkwebfragment.source" version="9.0.1.2"/> <unit id="zkwebfragment.source" version="9.5.0"/>
<unit id="zul" version="9.0.1.2"/> <unit id="zul" version="9.5.0"/>
<unit id="zul.source" version="9.0.1.2"/> <unit id="zul.source" version="9.5.0"/>
<unit id="zweb" version="9.0.1.2"/> <unit id="zweb" version="9.5.0"/>
<unit id="zweb-dsp" version="9.0.1.2"/> <unit id="zweb-dsp" version="9.5.0"/>
<unit id="zweb-dsp.source" version="9.0.1.2"/> <unit id="zweb-dsp.source" version="9.5.0"/>
<unit id="zweb.source" version="9.0.1.2"/> <unit id="zweb.source" version="9.5.0"/>
</location> </location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20200519/"/> <repository location="https://idempiere.github.io/binary.file/p2.maven/maven-p2-R20200519/"/>

2
org.idempiere.parent/pom.xml
View File

@ -15,7 +15,7 @@
<tycho.extras.version>${tycho.version}</tycho.extras.version> <tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jp.version>6.11.0</jp.version> <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> <zk.javassist.src.version>3.23.1-GA</zk.javassist.src.version>
<maven.dependency.version>3.1.1</maven.dependency.version> <maven.dependency.version>3.1.1</maven.dependency.version>
<download.maven.version>1.4.1</download.maven.version> <download.maven.version>1.4.1</download.maven.version>