diff --git a/zkdoc/release-note b/zkdoc/release-note index 8bf6f1c2db4..0ed390db9a8 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -5,6 +5,7 @@ ZK 10.0.1 ZK-5679: RichletMapping with "/" on Class does not work on StatelessRichlet class * Upgrade Notes + + Remove zkplus/liferay because it is designed for ie6 & ie7 which are not supported by ZK10. -------- ZK 10.0.0 diff --git a/zkplus/src/main/java/org/zkoss/zkplus/liferay/JQueryRenderCachedPatch.java b/zkplus/src/main/java/org/zkoss/zkplus/liferay/JQueryRenderCachedPatch.java deleted file mode 100644 index 8bb40445d20..00000000000 --- a/zkplus/src/main/java/org/zkoss/zkplus/liferay/JQueryRenderCachedPatch.java +++ /dev/null @@ -1,105 +0,0 @@ -/* JQueryRenderPatch.java - - Purpose: - - Description: - - History: - Sun Jan 17 11:48:04 TST 2010, Created by tomyeh - -Copyright (C) 2010 Potix Corporation. All Rights Reserved. - -*/ -package org.zkoss.zkplus.liferay; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Used to patch the rendering result of a ZK portlet for Liferay. - * When using ZK portlets with Liferay under Internet Explorer, we have - * to delay the processing at the client a bit. This patch assume - * "/zkau/web/js/zk.wpd" has loaded by Liferay, please refer to - * www.liferay.com document for configuration - * - *
To use it, you have to specify a library property called - * ""org.zkoss.zk.portlet.PageRenderPatch.class" with this class's name - * ("org.zkoss.zkplus.liferay.JQueryRenderCachedPatch"). - * - * @author tomyeh, sam - * @since 5.0.1 - */ -public class JQueryRenderCachedPatch extends JQueryRenderPatch { - private static final Logger log = LoggerFactory.getLogger(JQueryRenderCachedPatch.class); - - protected String getBrowserDelay() { - return "zk.ie6_ || zk.ie7_ ? 1300 : 100"; - } - - /** - * Append CSS link to head, and remove zk.wpd script - */ - protected String[] processHtml(String html) { - boolean isAppendCSS = false; - StringBuffer script = new StringBuffer( - ")"); - - StringBuffer buffer = new StringBuffer(); - int parseStart = 0, scriptStart = 0, scriptEnd = 0; - for (scriptStart = html.indexOf("".length(); - - removeScript(html, scriptStart, scriptEnd, scriptPattern, script, buffer); - if ((scriptStart = html.indexOf(""); - } - - protected String getBrowserDelay() { - return "" + _delay; - } - - protected String[] processHtml(String html) { - boolean isAppendCSS = false; - StringBuffer script = new StringBuffer( - "", scriptStart); - if (scriptEnd == -1) - break; - scriptEnd += "".length(); - buffer.append(html.subSequence(scriptStart, scriptEnd)); - if ((scriptStart = html.indexOf(""); - } - -} diff --git a/zkplus/src/main/java/org/zkoss/zkplus/liferay/package.html b/zkplus/src/main/java/org/zkoss/zkplus/liferay/package.html deleted file mode 100644 index 8b6814864b4..00000000000 --- a/zkplus/src/main/java/org/zkoss/zkplus/liferay/package.html +++ /dev/null @@ -1,8 +0,0 @@ - -
-Utilities to support Liferay Portal.
- -