You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2011/08/23 17:57:43 UTC
svn commit: r1160759 -
/myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
Author: sobryan
Date: Tue Aug 23 15:57:43 2011
New Revision: 1160759
URL: http://svn.apache.org/viewvc?rev=1160759&view=rev
Log:
TRINIDAD-2128 - Fix for library loading in a portal
Modified:
myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
Modified: myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java?rev=1160759&r1=1160758&r2=1160759&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java (original)
+++ myfaces/trinidad/branches/2.0.0.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java Tue Aug 23 15:57:43 2011
@@ -173,35 +173,35 @@ public class XhtmlUtils
// problems when resizing windows - but we're done with Netscape 4)
libURL = context.getExternalContext().encodeResourceURL(libURL.toString());
- if (XhtmlConstants.FACET_PORTLET.equals(rc.getOutputMode()))
- {
- if (rc.getProperties().get(_PORTLET_LIB_TABLE_KEY) == null)
- {
- rc.getProperties().put(_PORTLET_LIB_TABLE_KEY, Boolean.TRUE);
- writer.writeText("var _uixJSL;" +
- "if(!_uixJSL)_uixJSL={};" +
- "function _addJSL(u)" +
- "{" +
- "if(!_uixJSL[u])" +
- "{" +
- "_uixJSL[u]=1;" +
- "document.write(\"<scrip\"+" +
- "\"t src=\\\"\"+u+" +
- "\"\\\"></scrip\"+" +
- "\"t>\")" +
- "}" +
- "}",
- null);
- }
- writer.writeText("_addJSL(\"", null);
- writer.writeText(libURL, null);
- writer.writeText("\")", null);
- }
- else
- {
+// if (XhtmlConstants.FACET_PORTLET.equals(rc.getOutputMode()))
+// {
+// if (rc.getProperties().get(_PORTLET_LIB_TABLE_KEY) == null)
+// {
+// rc.getProperties().put(_PORTLET_LIB_TABLE_KEY, Boolean.TRUE);
+// writer.writeText("var _uixJSL;" +
+// "if(!_uixJSL)_uixJSL={};" +
+// "function _addJSL(u)" +
+// "{" +
+// "if(!_uixJSL[u])" +
+// "{" +
+// "_uixJSL[u]=1;" +
+// "document.write(\"<scrip\"+" +
+// "\"t src=\\\"\"+u+" +
+// "\"\\\"></scrip\"+" +
+// "\"t>\")" +
+// "}" +
+// "}",
+// null);
+// }
+// writer.writeText("_addJSL(\"", null);
+// writer.writeText(libURL, null);
+// writer.writeText("\")", null);
+// }
+// else
+// {
// The "safe" case: just write out the source
writer.writeURIAttribute("src", libURL, null);
- }
+// }
writer.endElement("script");
}