You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/08/03 06:31:18 UTC
svn commit: r428230 -
/myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
Author: matzew
Date: Wed Aug 2 21:31:18 2006
New Revision: 428230
URL: http://svn.apache.org/viewvc?rev=428230&view=rev
Log:
fixed MYFACES-1376 by moving to commits from "svn commit: r421297" to branch
Modified:
myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
Modified: myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?rev=428230&r1=428229&r2=428230&view=diff
==============================================================================
--- myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/branches/2_0_3/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Wed Aug 2 21:31:18 2006
@@ -44,8 +44,8 @@
public static final String JAVASCRIPT_DETECTED = JavascriptUtils.class.getName() + ".JAVASCRIPT_DETECTED";
- private static final String AUTO_SCROLL_PARAM = "autoScroll";
- private static final String AUTO_SCROLL_FUNCTION = "getScrolling()";
+ private static final String AUTO_SCROLL_PARAM = "org_apache_myfaces_autoScroll";
+ private static final String AUTO_SCROLL_FUNCTION = "org_apache_myfaces_getScrolling";
private static final String OLD_VIEW_ID = JavascriptUtils.class + ".OLD_VIEW_ID";
@@ -192,7 +192,7 @@
{
return "";
}
- StringBuffer sb = null; //create later on demand
+ StringBuffer sb = null; //create later on demand
String app;
char c;
for (int i = 0; i < string.length (); ++i)
@@ -255,7 +255,7 @@
public static void setJavascriptDetected(HttpSession session, boolean value)
{
- session.setAttribute(JAVASCRIPT_DETECTED, Boolean.valueOf(value));
+ session.setAttribute(JAVASCRIPT_DETECTED, Boolean.valueOf(value));
}
public static boolean isJavascriptDetected(ExternalContext externalContext)
@@ -272,9 +272,13 @@
*/
public static void appendAutoScrollAssignment(StringBuffer onClickValue, String formName)
{
+ onClickValue.append("if(window."+AUTO_SCROLL_FUNCTION+"!=undefined)");
+ onClickValue.append("{");
onClickValue.append("document.forms['").append(formName).append("']");
onClickValue.append(".elements['").append(AUTO_SCROLL_PARAM).append("']");
- onClickValue.append(".value=").append(AUTO_SCROLL_FUNCTION).append(";");
+ onClickValue.append(".value=").append(AUTO_SCROLL_FUNCTION).append("();");
+ onClickValue.append("}");
+
}
/**
@@ -304,7 +308,7 @@
script.append("function ");
script.append(AUTO_SCROLL_FUNCTION);
- script.append(" {\n");
+ script.append("() {\n");
script.append(" var x = 0; var y = 0;\n");
script.append( " if (self.pageXOffset || self.pageYOffset) {\n"+
" x = self.pageXOffset;\n" +
@@ -360,4 +364,4 @@
{
return (String)externalContext.getRequestMap().get(OLD_VIEW_ID);
}
-}
+}
\ No newline at end of file