From bffb3166c6bf4cc0af5e30cf2cd52fcc7fad698d Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Sat, 12 Dec 2020 19:18:36 +0800
Subject: [PATCH] IDEMPIERE-4528 Update Js Library (#461)

* IDEMPIERE-4528 Update Js Library

Fix session timeout page broken.

* IDEMPIERE-4528 Update Js Library

add version info for keylistener component
---
 org.adempiere.ui.zk/META-INF/MANIFEST.MF                   | 4 ++--
 org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml | 3 ++-
 .../src/web/js/zkforge/{ => keylistener}/KeyListener.js    | 6 +++---
 .../web/js/zkforge/{ => keylistener}/mold/key-listener.js  | 0
 .../WEB-INF/src/web/js/zkforge/keylistener/zk.wpd          | 3 +++
 org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/zk.wpd      | 3 ---
 org.adempiere.ui.zk/sessiontimeout.zul                     | 7 ++++++-
 org.adempiere.ui.zk/timeout.zul                            | 7 ++++++-
 8 files changed, 22 insertions(+), 11 deletions(-)
 rename org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/{ => keylistener}/KeyListener.js (92%)
 rename org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/{ => keylistener}/mold/key-listener.js (100%)
 create mode 100644 org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/zk.wpd
 delete mode 100644 org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/zk.wpd

diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index a3afe89c84..88acfaf70e 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -151,8 +151,8 @@ Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  web.js.ckez.ext.CKeditor.plugins.wsc.dialogs,
  web.js.ckez.ext.CKeditor.plugins.wsc.skins,
  web.js.ckez.ext.CKeditor.skins,
- web.js.zkforge,
- web.js.zkforge.mold
+ web.js.zkforge.keylistener,
+ web.js.zkforge.keylistener.mold
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.idempiere.zk.extra;bundle-version="0.0.0",
diff --git a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
index 9c713ce04b..a8c417056e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
+++ b/org.adempiere.ui.zk/WEB-INF/src/metainfo/zk/lang-addon.xml
@@ -26,7 +26,7 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
 	<component>
 		<component-name>keylistener</component-name>
 		<component-class>org.zkforge.keylistener.Keylistener</component-class>
-		<widget-class>zkforge.KeyListener</widget-class>
+		<widget-class>zkforge.keylistener.KeyListener</widget-class>
 		<mold>
 			<mold-name>default</mold-name>
 			<mold-uri>mold/key-listener.js</mold-uri>
@@ -52,6 +52,7 @@ Copyright (C) 2007 Ashley G Ramdass (ADempiere WebUI).
 	<javascript-module name="jquery.maskedinput" version="1.4.1" />
 	<javascript-module name="photobooth"	version="0.7-rsd3" />
 	<javascript-module name="chosenbox" version="202012041500"/>
+	<javascript-module name="zkforge.keylistener" version="202012120100"/>
 	
 	<!-- this js module doesn't actually exists and it is here for default theme version -->
 	<!-- since loading of  js module is on demand, it doesn't cause any error as long as you don't try to load it -->
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/KeyListener.js b/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/KeyListener.js
similarity index 92%
rename from org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/KeyListener.js
rename to org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/KeyListener.js
index 55130ca0a5..37cfc36d77 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/KeyListener.js
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/KeyListener.js
@@ -2,7 +2,7 @@
 
 {{IS_NOTE
 	Purpose:
-		zkforge.KeyListener
+		zkforge.keylistener.KeyListener
 	Description:
 		Keylistener component for ZK.
 }}IS_NOTE
@@ -15,8 +15,8 @@ Copyright 2007 by Easit AB. All rights reserved.
 }}IS_RIGHT
 */
 
-zk.$package('zkforge');
-zkforge.KeyListener = zk.$extends(zul.Widget, {
+zk.$package('zkforge.keylistener');
+zkforge.keylistener.KeyListener = zk.$extends(zul.Widget, {
 	_ctrlKeys: null,
 	_autoBlur: true,
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/mold/key-listener.js b/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/mold/key-listener.js
similarity index 100%
rename from org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/mold/key-listener.js
rename to org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/mold/key-listener.js
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/zk.wpd b/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/zk.wpd
new file mode 100644
index 0000000000..a0734df67a
--- /dev/null
+++ b/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/keylistener/zk.wpd
@@ -0,0 +1,3 @@
+<package name="zkforge.keylistener" language="xul/html" depends="zul">
+	<widget name="KeyListener"/>
+</package>
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/zk.wpd b/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/zk.wpd
deleted file mode 100644
index 302ba275c4..0000000000
--- a/org.adempiere.ui.zk/WEB-INF/src/web/js/zkforge/zk.wpd
+++ /dev/null
@@ -1,3 +0,0 @@
-<package name="zkforge" language="xul/html" depends="zul">
-	<widget name="KeyListener"/>
-</package>
\ No newline at end of file
diff --git a/org.adempiere.ui.zk/sessiontimeout.zul b/org.adempiere.ui.zk/sessiontimeout.zul
index 91e46a976f..1e075f4f6d 100644
--- a/org.adempiere.ui.zk/sessiontimeout.zul
+++ b/org.adempiere.ui.zk/sessiontimeout.zul
@@ -18,8 +18,13 @@
 	<button id="continueText" href="/index.zul" label="Continue"/>
 </div>
 </vbox>
-<script defer="true">
+<script>
 <![CDATA[
+	zk.load("adempiere.local.storage");
+]]>
+</script>
+<script defer="true">
+<![CDATA[		
 	var callback = function(ok, val) {
 		if (ok && !!val)
 		{
diff --git a/org.adempiere.ui.zk/timeout.zul b/org.adempiere.ui.zk/timeout.zul
index 803f95705f..5344561cdb 100644
--- a/org.adempiere.ui.zk/timeout.zul
+++ b/org.adempiere.ui.zk/timeout.zul
@@ -1,7 +1,12 @@
 <?page title="iDempiere" contentType="text/html;charset=UTF-8" automaticTimeout="false" ?>
 <zk>
-<script defer="true">
+<script>
 <![CDATA[
+	zk.load("adempiere.local.storage");
+]]>
+</script>
+<script defer="true">
+<![CDATA[		
 	var callback = function(ok, val) {
 		if (ok && !!val)
 		{