myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sobr...@apache.org
Subject svn commit: r1335826 - /myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
Date Tue, 08 May 2012 23:26:36 GMT
Author: sobryan
Date: Tue May  8 23:26:36 2012
New Revision: 1335826

URL: http://svn.apache.org/viewvc?rev=1335826&view=rev
Log:
TRINIDAD-2128 - Fix for library loading in a portal

Modified:
    myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java

Modified: myfaces/trinidad/branches/2.0.0.x-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.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java?rev=1335826&r1=1335825&r2=1335826&view=diff
==============================================================================
--- myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
(original)
+++ myfaces/trinidad/branches/2.0.0.x-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/XhtmlUtils.java
Tue May  8 23:26:36 2012
@@ -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");
   }



Mime
View raw message