Author: lryan
Date: Mon Aug  4 17:22:54 2008
New Revision: 682551

URL: http://svn.apache.org/viewvc?rev=682551&view=rev
Log:
Add support for the 'caja' feature to trigger Caja filtering

Modified:
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=682551&r1=682550&r2=682551&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
 Mon Aug  4 17:22:54 2008
@@ -135,12 +135,18 @@
       return;
     }
 
+    boolean addedCaja = false;
     if (getUseCaja(request)) {
       filters.add(new CajaContentFilter(url));
+      addedCaja = true;
     }
 
     try {
       Gadget gadget = server.processGadget(context);
+      if (!addedCaja &&
+          gadget.getSpec().getModulePrefs().getFeatures().containsKey("caja")) 
{
+        filters.add(new CajaContentFilter(url));
+      }
       outputGadget(gadget);
     } catch (GadgetException e) {
       outputErrors(e);


Reply via email to