You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by zh...@apache.org on 2010/08/27 03:11:18 UTC
svn commit: r989993 - in
/shindig/trunk/features/src/main/javascript/features/container:
container.js gadget_holder.js init.js service.js
Author: zhoresh
Date: Fri Aug 27 01:11:18 2010
New Revision: 989993
URL: http://svn.apache.org/viewvc?rev=989993&view=rev
Log:
Runtime &renderDebug= for common container
http://codereview.appspot.com/1895047/
Modified:
shindig/trunk/features/src/main/javascript/features/container/container.js
shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js
shindig/trunk/features/src/main/javascript/features/container/init.js
shindig/trunk/features/src/main/javascript/features/container/service.js
Modified: shindig/trunk/features/src/main/javascript/features/container/container.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/container.js?rev=989993&r1=989992&r2=989993&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/container.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/container.js Fri Aug 27 01:11:18 2010
@@ -42,14 +42,24 @@ shindig.container.Container = function(o
this.sites_ = {};
/**
- * @type {boolean}
+ * @type {string}
*/
- this.renderDebug_ = Boolean(shindig.container.util.getSafeJsonValue(config,
- shindig.container.ContainerConfig.RENDER_DEBUG, false));
+ this.renderDebugParam_ = String(shindig.container.util.getSafeJsonValue(
+ config, shindig.container.ContainerConfig.RENDER_DEBUG_PARAM,
+ shindig.container.ContainerConfig.RENDER_DEBUG));
/**
* @type {boolean}
*/
+ var param = window.__CONTAINER_URI.getQP(this.renderDebugParam_);
+ this.renderDebug_ = (typeof param === 'undefined')
+ ? Boolean(shindig.container.util.getSafeJsonValue(config,
+ shindig.container.ContainerConfig.RENDER_DEBUG, false))
+ : (param === '1');
+
+ /**
+ * @type {boolean}
+ */
this.renderTest_ = Boolean(shindig.container.util.getSafeJsonValue(config,
shindig.container.ContainerConfig.RENDER_TEST, false));
@@ -163,11 +173,7 @@ shindig.container.Container.prototype.na
*/
shindig.container.Container.prototype.closeGadget = function(site) {
var id = site.getId();
- var el = this.siteEls_[id];
site.close();
- if (el) {
- el.parentNode.removeChild(el);
- }
delete this.sites_[id];
this.unscheduleRefreshTokens_();
};
@@ -242,6 +248,8 @@ shindig.container.Container.prototype.on
shindig.container.ContainerConfig = {};
// Whether debug mode is turned on.
shindig.container.ContainerConfig.RENDER_DEBUG = 'renderDebug';
+// The debug param name to look for in container URL for per-request debugging.
+shindig.container.ContainerConfig.RENDER_DEBUG_PARAM = 'renderDebugParam';
// Whether test mode is turned on.
shindig.container.ContainerConfig.RENDER_TEST = 'renderTest';
// Security token refresh interval (in ms) for debugging.
Modified: shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js?rev=989993&r1=989992&r2=989993&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js Fri Aug 27 01:11:18 2010
@@ -275,7 +275,7 @@ shindig.container.GadgetHolder.prototype
// TODO: Share this base container logic
// TODO: Two SD base URIs - one for container, one for gadgets
// Need to add parent at end of query due to gadgets parsing bug
- uri.setQP('parent', window.__CONTAINER_HOST);
+ uri.setQP('parent', window.__CONTAINER_URI.getOrigin());
// Remove existing social token if we have a new one
if (this.securityToken_) {
Modified: shindig/trunk/features/src/main/javascript/features/container/init.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/init.js?rev=989993&r1=989992&r2=989993&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/init.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/init.js Fri Aug 27 01:11:18 2010
@@ -40,12 +40,11 @@
}
function initializeGlobalVars() {
- var scriptUri = getLastScriptUri();
- if (scriptUri) {
- window.__API_HOST = scriptUri.getOrigin();
- window.__CONTAINER = scriptUri.getQP('container');
- }
- window.__CONTAINER_HOST = shindig.uri(document.location.href).getOrigin();
+ window.__API_URI = getLastScriptUri();
+ window.__CONTAINER = window.__API_URI
+ ? window.__API_URI.getQP('container')
+ : 'default';
+ window.__CONTAINER_URI = shindig.uri(document.location.href);
}
function getLastScriptUri() {
Modified: shindig/trunk/features/src/main/javascript/features/container/service.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/service.js?rev=989993&r1=989992&r2=989993&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/service.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/service.js Fri Aug 27 01:11:18 2010
@@ -34,7 +34,7 @@ shindig.container.Service = function(opt
* @type {string}
*/
this.apiHost_ = String(shindig.container.util.getSafeJsonValue(config,
- shindig.container.ServiceConfig.API_HOST, window.__API_HOST));
+ shindig.container.ServiceConfig.API_HOST, window.__API_URI.getOrigin()));
/**
* @type {string}