You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/09/17 23:04:27 UTC
svn commit: r289854 -
/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
Author: mmarinschek
Date: Sat Sep 17 14:04:21 2005
New Revision: 289854
URL: http://svn.apache.org/viewcvs?rev=289854&view=rev
Log:
fix for MYFACES-512. Thanks to Martin Zdila for providing this patch!
Modified:
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java?rev=289854&r1=289853&r2=289854&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java Sat Sep 17 14:04:21 2005
@@ -298,19 +298,21 @@
StringBuffer script = new StringBuffer();
script.append("\n");
+
+
script.append("function " + AUTO_SCROLL_FUNCTION + " {\n" +
- " var x = 0; var y = 0;\n" +
- " if (document.body && document.body.scrollLeft && !isNaN(document.body.scrollLeft)) {\n" +
- " x = document.body.scrollLeft;\n" +
- " } else if (window.pageXOffset && !isNaN(window.pageXOffset)) {\n" +
- " x = window.pageXOffset;\n" +
- " }\n" +
- " if (document.body && document.body.scrollTop && !isNaN(document.body.scrollTop)) {\n" +
- " y = document.body.scrollTop;\n" +
- " } else if (window.pageYOffset && !isNaN(window.pageYOffset)) {\n" +
- " y = window.pageYOffset;\n" +
- " }\n" +
- " return x + \",\" + y;\n" +
+ " var x = 0; var y = 0;\n" +
+ " if (self.pageXOffset) {\n" +
+ " x = self.pageXOffset;\n" +
+ " y = self.pageYOffset;\n" +
+ " } else if (document.documentElement && document.documentElement.scrollLeft) {\n" +
+ " x = document.documentElement.scrollLeft;\n" +
+ " y = document.documentElement.scrollTop;\n" +
+ " } else if (document.body) {\n" +
+ " x = document.body.scrollLeft;\n" +
+ " y = document.body.scrollTop;\n" +
+ " }\n" +
+ " return x + \",\" + y;\n" +
"}\n");
ExternalContext externalContext = facesContext.getExternalContext();
String oldViewId = getOldViewId(externalContext);