You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by dd...@apache.org on 2013/02/19 23:52:52 UTC
svn commit: r1447953 - in /shindig/trunk/features/src:
main/javascript/features/container.site.gadget/
main/javascript/features/container/ test/javascript/features/container/
Author: ddumont
Date: Tue Feb 19 22:52:52 2013
New Revision: 1447953
URL: http://svn.apache.org/r1447953
Log:
Fix issue with commit for SHINDIG-1902
Modified:
shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js
shindig/trunk/features/src/main/javascript/features/container/container.js
shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js
shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js
Modified: shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js?rev=1447953&r1=1447952&r2=1447953&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js Tue Feb 19 22:52:52 2013
@@ -79,13 +79,6 @@ osapi.container.GadgetSite = function(co
*/
this.loadingGadgetHolder_ = undef;
- var self = this;
- var listeners = {};
- listeners[osapi.container.CallbackType.ON_RENDER] = function(gadgetUrl) {
- self.onRender();
- };
- container.addGadgetLifecycleCallback('gadget_site_on_render_' + this.getId(), listeners);
-
this.onConstructed();
};
@@ -341,12 +334,8 @@ osapi.container.GadgetSite.prototype.ren
/**
* Called when a gadget loads in the site. Uses double buffer, if present.
- * @param {Object} gadgetInfo the JSON gadget description.
- * @param {Object} viewParams Look at osapi.container.ViewParam.
- * @param {Object} renderParams Look at osapi.container.RenderParam.
*/
-osapi.container.GadgetSite.prototype.onRender = function(
- gadgetInfo, viewParams, renderParams) {
+osapi.container.GadgetSite.prototype.onRender = function() {
this.swapBuffers_();
if (this.currentGadgetHolder_) {
@@ -400,7 +389,6 @@ osapi.container.GadgetSite.prototype.clo
if (this.currentGadgetHolder_) {
this.currentGadgetHolder_.dispose();
}
- this.container_.removeGadgetLifecycleCallback('gadget_site_on_render_' + this.getId());
};
/**
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=1447953&r1=1447952&r2=1447953&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/container.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container/container.js Tue Feb 19 22:52:52 2013
@@ -139,8 +139,9 @@ osapi.container.Container = function(opt
this.tokenRefreshTimer_ = null;
var self = this;
- window[osapi.container.CallbackType.GADGET_ON_LOAD] = function(gadgetUrl, siteId){
- self.applyLifecycleCallbacks_(osapi.container.CallbackType.ON_RENDER, gadgetUrl, siteId);
+ window[osapi.container.CallbackType.GADGET_ON_LOAD] = function(gadgetUrl, siteId) {
+ self.getSiteById(siteId).onRender();
+ self.applyLifecycleCallbacks_(osapi.container.CallbackType.ON_RENDER, gadgetUrl, siteId);
};
this.initializeMixins_();
Modified: shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js?rev=1447953&r1=1447952&r2=1447953&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js (original)
+++ shindig/trunk/features/src/test/javascript/features/container/gadget_holder_test.js Tue Feb 19 22:52:52 2013
@@ -49,10 +49,8 @@ GadgetHolderTest.prototype.testNew = fun
},
id: '123'
};
- var container = this.createContainer();
- var site = new osapi.container.GadgetSite(container, null, {gadgetEl: element});
+ var site = new osapi.container.GadgetSite(null, null, {gadgetEl: element});
var holder = new osapi.container.GadgetHolder(site, element);
- this.assertEquals('gadget_site_on_render_123', container.getCallbackId());
this.assertEquals(element, holder.getElement());
this.assertUndefined(holder.getIframeId());
this.assertUndefined(holder.getGadgetInfo());
@@ -72,11 +70,9 @@ GadgetHolderTest.prototype.testRenderWit
var service = {};
service.getCountry = function(){return "ZH";};
service.getLanguage = function(){return "cn"};
- var container = this.createContainer();
- var site = new osapi.container.GadgetSite(container, service, {gadgetEl: element});
+ var site = new osapi.container.GadgetSite(null, service, {gadgetEl: element});
var holder = new osapi.container.GadgetHolder(site, element, '__gadgetOnLoad');
holder.render(gadgetInfo, {}, {'view' : 'default'});
- this.assertEquals('gadget_site_on_render_123', container.getCallbackId());
this.assertEquals('<iframe' +
' marginwidth="0"' +
' hspace="0"' +
@@ -115,11 +111,9 @@ GadgetHolderTest.prototype.testRenderWit
var service = {};
service.getCountry = function(){return "US";};
service.getLanguage = function(){return "en"};
- var container = this.createContainer();
- var site = new osapi.container.GadgetSite(container, service, {gadgetEl: element, moduleId: 123});
+ var site = new osapi.container.GadgetSite(null, service, {gadgetEl: element, moduleId: 123});
var holder = new osapi.container.GadgetHolder(site, element, '__gadgetOnLoad');
holder.render(gadgetInfo, {}, renderParams);
- this.assertEquals('gadget_site_on_render_123', container.getCallbackId());
this.assertEquals('<iframe' +
' marginwidth="0"' +
' hspace="0"' +
@@ -182,15 +176,3 @@ GadgetHolderTest.prototype.setupMockPubs
};
return gadgets.pubsub2router.hub;
};
-
-GadgetHolderTest.prototype.createContainer = function() {
- var container = {};
- var callbackId;
- container.addGadgetLifecycleCallback = function(id, listeners) {
- callbackId = id;
- }
- container.getCallbackId = function() {
- return callbackId;
- }
- return container;
-};
Modified: shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js?rev=1447953&r1=1447952&r2=1447953&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js (original)
+++ shindig/trunk/features/src/test/javascript/features/container/gadget_site_test.js Tue Feb 19 22:52:52 2013
@@ -59,15 +59,9 @@ GadgetSiteTest.prototype.tearDown = func
};
GadgetSiteTest.prototype.testGetId = function() {
- var site;
- var container = this.createContainer();
- site = new osapi.container.GadgetSite(container, null, {});
- this.assertEquals('gadget_site_on_render_' + (osapi.container.Site.prototype.nextUniqueSiteId_ - 1),
- container.getCallbackId());
+ var site = new osapi.container.GadgetSite(null, null, {});
this.assertEquals(osapi.container.Site.prototype.nextUniqueSiteId_ - 1, site.getId());
- site = new osapi.container.GadgetSite(container, null, {});
- this.assertEquals('gadget_site_on_render_' + (osapi.container.Site.prototype.nextUniqueSiteId_ - 1),
- container.getCallbackId());
+ site = new osapi.container.GadgetSite(null, null, {});
this.assertEquals(osapi.container.Site.prototype.nextUniqueSiteId_ - 1, site.getId());
};
@@ -135,19 +129,7 @@ GadgetSiteTest.prototype.newMetadataErro
};
GadgetSiteTest.prototype.newGadgetSite = function(service, navigateCallback) {
- return new osapi.container.GadgetSite(this.createContainer(), service, {
+ return new osapi.container.GadgetSite(null, service, {
'navigateCallback' : navigateCallback
});
};
-
-GadgetSiteTest.prototype.createContainer = function() {
- var container = {};
- var callbackId;
- container.addGadgetLifecycleCallback = function(id, listeners) {
- callbackId = id;
- }
- container.getCallbackId = function() {
- return callbackId;
- }
- return container;
-};