Author: rbaxter85
Date: Fri Jul 26 00:27:54 2013
New Revision: 1507163
URL: http://svn.apache.org/r1507163
Log:
SHINDIG-1922
Pubsub gadgets fail to render in commoncontainer
Modified:
shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
Modified:
shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js?rev=1507163&r1=1507162&r2=1507163&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/container.site/site_holder.js
Fri Jul 26 00:27:54 2013
@@ -109,9 +109,11 @@ osapi.container.SiteHolder.prototype.dis
* @protected
*/
osapi.container.SiteHolder.prototype.createIframeHtml = function(url,
overrides) {
- return osapi.container.util.createIframeHtml(
- this.createIframeAttributeMap(url, overrides)
- );
+ var undef,
+ map = this.createIframeAttributeMap(url, overrides);
+ map['onload'] = this.onLoad_ ?
+ ('window.' + this.onLoad_ + "('" + this.getUrl() + "', '" +
this.site_.getId() + "');") : undef;
+ return osapi.container.util.createIframeHtml(map);
};
/**
@@ -122,8 +124,7 @@ osapi.container.SiteHolder.prototype.cre
* @protected
*/
osapi.container.SiteHolder.prototype.createIframeAttributeMap = function(url,
overrides) {
- var undef,
- renderParams = this.renderParams_ || {},
+ var renderParams = this.renderParams_ || {},
params = {
id: this.iframeId_,
name: this.iframeId_,
@@ -136,9 +137,7 @@ osapi.container.SiteHolder.prototype.cre
hspace: 0,
'class': renderParams[osapi.container.RenderParam.CLASS],
height: renderParams[osapi.container.RenderParam.HEIGHT],
- width: renderParams[osapi.container.RenderParam.WIDTH],
- onload: this.onLoad_ ?
- ('window.' + this.onLoad_ + "('" + this.getUrl() + "', '" +
this.site_.getId() + "');") : undef
+ width: renderParams[osapi.container.RenderParam.WIDTH]
};
if (overrides) {
for(var i in overrides) {
