Author: johnh
Date: Fri Jun 3 01:32:58 2011
New Revision: 1130883
URL: http://svn.apache.org/viewvc?rev=1130883&view=rev
Log:
Small JS updates:
* Allow value other than "1" to be "true" for isDebug()
* Propagate extensionParams in ProxyUriBase.
* Stub compilation-String retrieval method in ClosureJsCompiler.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
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=1130883&r1=1130882&r2=1130883&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
Fri Jun 3 01:32:58 2011
@@ -147,6 +147,7 @@ public interface JsUriManager {
this.context = origJsUri.getContext();
this.origUri = origJsUri.getOrigUri();
this.repository = origJsUri.getRepository();
+ this.extensionParams = origJsUri.getExtensionParams();
}
public Collection<String> getLibs() {
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java?rev=1130883&r1=1130882&r2=1130883&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
Fri Jun 3 01:32:58 2011
@@ -92,7 +92,7 @@ public class ProxyUriBase {
public void setFromUri(Uri uri) {
if (uri != null) {
refresh = getIntegerValue(uri.getQueryParameter(Param.REFRESH.getKey()));
- debug = getBooleanValue(uri.getQueryParameter(Param.DEBUG.getKey()));
+ debug = getTruthyValue(uri.getQueryParameter(Param.DEBUG.getKey()));
noCache =
getBooleanValue(uri.getQueryParameter(Param.NO_CACHE.getKey()));
String newContainer = uri.getQueryParameter(Param.CONTAINER.getKey());
if (newContainer == null) {
@@ -110,6 +110,10 @@ public class ProxyUriBase {
}
}
+ protected static boolean getTruthyValue(String str) {
+ return str != null && !"0".equals(str) && str.length() > 0;
+ }
+
@Override
public boolean equals(Object obj) {
if (obj == this) {
Modified:
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1130883&r1=1130882&r2=1130883&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
Fri Jun 3 01:32:58 2011
@@ -156,7 +156,7 @@ public class ClosureJsCompiler implement
errors.build());
}
- String compiled = actualCompiler.toSource();
+ String compiled = compileToSource(actualCompiler, result, jsUri);
if (outputCorrelatedJs()) {
// Emit code correlated w/ original source.
// This operation is equivalent in final code to bundled-output,
@@ -185,6 +185,10 @@ public class ClosureJsCompiler implement
lastResult = result;
return result;
}
+
+ protected String compileToSource(Compiler compiler, Result result, JsUri
jsUri) {
+ return compiler.toSource();
+ }
private JsResponse cacheAndReturnErrorResult(
JsResponseBuilder builder, String cacheKey,
