shindig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From feli...@apache.org
Subject svn commit: r1145104 - in /shindig/trunk: java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java pom.xml
Date Mon, 11 Jul 2011 10:08:05 GMT
Author: felix8a
Date: Mon Jul 11 10:08:05 2011
New Revision: 1145104

URL: http://svn.apache.org/viewvc?rev=1145104&view=rev
Log:
fix handling of caja=1
https://reviews.apache.org/r/1060/

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
    shindig/trunk/pom.xml

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=1145104&r1=1145103&r2=1145104&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
(original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
Mon Jul 11 10:08:05 2011
@@ -380,6 +380,7 @@ public class RenderingGadgetRewriter imp
     JsUri jsUri = new JsUri(null, context.getDebug(), false, context.getContainer(), null,
         libs, loaded, null, false, false, RenderingContext.getDefault(), null,
         getFeatureRepositoryId(gadget));
+    jsUri.setCajoleContent(gadget.requiresCaja());
 
     String content = "";
     if (!inline) {

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java?rev=1145104&r1=1145103&r2=1145104&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
(original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
Mon Jul 11 10:08:05 2011
@@ -142,6 +142,7 @@ public interface JsUriManager {
           origJsUri.isNoCache(),
           origJsUri.getContainer(),
           origJsUri.getGadget());
+      this.setCajoleContent(origJsUri.cajoleContent());
       this.libs = origJsUri.getLibs();
       this.loadedLibs = origJsUri.getLoadedLibs();
       this.onload = origJsUri.getOnload();

Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1145104&r1=1145103&r2=1145104&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Mon Jul 11 10:08:05 2011
@@ -377,6 +377,15 @@
         <role>PMC Member</role>
       </roles>
     </developer>
+    <developer>
+      <id>felix8a</id>
+      <name>Felix Lee</name>
+      <email>felix8a@apache.org</email>
+      <organization>ASF</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+    </developer>
 
     <!-- Mentors -->
     <developer>



Mime
View raw message