Author: johnh
Date: Tue Aug 4 23:35:29 2009
New Revision: 801020
URL: http://svn.apache.org/viewvc?rev=801020&view=rev
Log:
Cleanup. Get rid of dangling ampersand when no rewriteMime is provided.
Modified:
incubator/shindig/trunk/config/container.js
incubator/shindig/trunk/features/src/main/javascript/features/core.io/io.js
Modified: incubator/shindig/trunk/config/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/config/container.js?rev=801020&r1=801019&r2=801020&view=diff
==============================================================================
--- incubator/shindig/trunk/config/container.js (original)
+++ incubator/shindig/trunk/config/container.js Tue Aug 4 23:35:29 2009
@@ -96,7 +96,7 @@
"gadgets.features" : {
"core.io" : {
// Note: /proxy is an open proxy. Be careful how you expose this!
- "proxyUrl" :
"http://%host%/gadgets/proxy?refresh=%refresh%&url=%url%&%rewriteMime%";,
+ "proxyUrl" :
"http://%host%/gadgets/proxy?refresh=%refresh%&url=%url%%rewriteMime%";,
"jsonProxyUrl" : "http://%host%/gadgets/makeRequest";
},
"views" : {
Modified:
incubator/shindig/trunk/features/src/main/javascript/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/core.io/io.js?rev=801020&r1=801019&r2=801020&view=diff
==============================================================================
--- incubator/shindig/trunk/features/src/main/javascript/features/core.io/io.js
(original)
+++ incubator/shindig/trunk/features/src/main/javascript/features/core.io/io.js
Tue Aug 4 23:35:29 2009
@@ -471,7 +471,7 @@
var urlParams = gadgets.util.getUrlParameters();
var rewriteMimeParam =
- params.rewriteMime ? "rewriteMime=" +
encodeURIComponent(params.rewriteMime) : "";
+ params.rewriteMime ? "&rewriteMime=" +
encodeURIComponent(params.rewriteMime) : "";
return config.proxyUrl.replace("%url%", encodeURIComponent(url)).
replace("%host%", document.location.host).
replace("%rawurl%", url).
