cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r325891 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal: layout/renderer/aspect/impl/WindowAspect.java transformation/HTMLEventLinkTransformer.java
Date Mon, 17 Oct 2005 13:45:49 GMT
Author: cziegeler
Date: Mon Oct 17 06:45:43 2005
New Revision: 325891

URL: http://svn.apache.org/viewcvs?rev=325891&view=rev
Log:
Include coplet instance id and ignore javascript links during rewriting

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?rev=325891&r1=325890&r2=325891&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
Mon Oct 17 06:45:43 2005
@@ -68,6 +68,7 @@
             XMLUtils.startElement(contenthandler, config.tagName);
         }
         XMLUtils.createElement(contenthandler, "title", copletInstanceData.getTitle());
+        XMLUtils.createElement(contenthandler , "instance-id", copletInstanceData.getId());
 
         context.invokeNext( layout, service, contenthandler );
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java?rev=325891&r1=325890&r2=325891&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java
Mon Oct 17 06:45:43 2005
@@ -201,7 +201,8 @@
             return true;
         }
         final String link = attributes.getValue("href");
-        if ( link != null && link.startsWith("mailto:") ) {
+        if ( link != null 
+             && (link.startsWith("mailto:") || link.startsWith("javascript:") ) )
{
             return true;
         }
         return false;



Mime
View raw message