You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by an...@apache.org on 2006/05/08 20:03:54 UTC

svn commit: r405111 - in /tapestry/tapestry4/branches/4.0/framework/src: java/org/apache/tapestry/services/impl/BaseTagWriter.java scripts/TestLibrary.xml scripts/TestSimple.xml test/org/apache/tapestry/services/impl/TestBaseTagWriter.java

Author: andyhot
Date: Mon May  8 11:03:54 2006
New Revision: 405111

URL: http://svn.apache.org/viewcvs?rev=405111&view=rev
Log:
[TAPESTRY-935] Output closing base tag in IE conditional comments

Modified:
    tapestry/tapestry4/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/BaseTagWriter.java
    tapestry/tapestry4/branches/4.0/framework/src/scripts/TestLibrary.xml
    tapestry/tapestry4/branches/4.0/framework/src/scripts/TestSimple.xml
    tapestry/tapestry4/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java

Modified: tapestry/tapestry4/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/BaseTagWriter.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/BaseTagWriter.java?rev=405111&r1=405110&r2=405111&view=diff
==============================================================================
--- tapestry/tapestry4/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/BaseTagWriter.java (original)
+++ tapestry/tapestry4/branches/4.0/framework/src/java/org/apache/tapestry/services/impl/BaseTagWriter.java Mon May  8 11:03:54 2006
@@ -55,7 +55,8 @@
         String url = cycle.getAbsoluteURL(sb.toString());
 
         writer.beginEmpty("base");
-        writer.attribute("href", url);
+        writer.attribute("href", url);        
+        writer.printRaw("<!--[if IE]></base><![endif]-->");
 
         writer.println();
     }

Modified: tapestry/tapestry4/branches/4.0/framework/src/scripts/TestLibrary.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/framework/src/scripts/TestLibrary.xml?rev=405111&r1=405110&r2=405111&view=diff
==============================================================================
--- tapestry/tapestry4/branches/4.0/framework/src/scripts/TestLibrary.xml (original)
+++ tapestry/tapestry4/branches/4.0/framework/src/scripts/TestLibrary.xml Mon May  8 11:03:54 2006
@@ -47,6 +47,7 @@
 		<match>head</match>
 		<match>meta</match>
     <match>base</match>
+    <match>/base</match>
 		<match>title</match>
 		<match>/title</match>
 		<match>link</match>

Modified: tapestry/tapestry4/branches/4.0/framework/src/scripts/TestSimple.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/framework/src/scripts/TestSimple.xml?rev=405111&r1=405110&r2=405111&view=diff
==============================================================================
--- tapestry/tapestry4/branches/4.0/framework/src/scripts/TestSimple.xml (original)
+++ tapestry/tapestry4/branches/4.0/framework/src/scripts/TestSimple.xml Mon May  8 11:03:54 2006
@@ -40,6 +40,7 @@
 		<match>head</match>
 		<match>meta</match>
     <match>base</match>
+    <match>/base</match>
 		<match>title</match>
 		<match>/title</match>
 		<match>/head</match>

Modified: tapestry/tapestry4/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java?rev=405111&r1=405110&r2=405111&view=diff
==============================================================================
--- tapestry/tapestry4/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java (original)
+++ tapestry/tapestry4/branches/4.0/framework/src/test/org/apache/tapestry/services/impl/TestBaseTagWriter.java Mon May  8 11:03:54 2006
@@ -35,6 +35,7 @@
 
         writer.beginEmpty("base");
         writer.attribute("href", url);
+        writer.printRaw("<!--[if IE]></base><![endif]-->");
         writer.println();
 
         return writer;