You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2011/08/16 19:06:54 UTC
svn commit: r1158376 - in /shindig/trunk:
content/samplecontainer/examples/embeddedexperiences/
features/src/main/javascript/features/container.url/
features/src/main/javascript/features/open-views/
features/src/test/javascript/features/container.url/
Author: rbaxter85
Date: Tue Aug 16 17:06:54 2011
New Revision: 1158376
URL: http://svn.apache.org/viewvc?rev=1158376&view=rev
Log:
SHINDIG-1573
Committed for Jason Chiang
views.openEmbeddedExperience did not handle a URL embedded experience
Modified:
shindig/trunk/content/samplecontainer/examples/embeddedexperiences/PhotoList.xml
shindig/trunk/features/src/main/javascript/features/container.url/url_holder.js
shindig/trunk/features/src/main/javascript/features/open-views/viewenhancements-container.js
shindig/trunk/features/src/test/javascript/features/container.url/url_holder_test.js
shindig/trunk/features/src/test/javascript/features/container.url/url_site_test.js
Modified: shindig/trunk/content/samplecontainer/examples/embeddedexperiences/PhotoList.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/embeddedexperiences/PhotoList.xml?rev=1158376&r1=1158375&r2=1158376&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/embeddedexperiences/PhotoList.xml (original)
+++ shindig/trunk/content/samplecontainer/examples/embeddedexperiences/PhotoList.xml Tue Aug 16 17:06:54 2011
@@ -85,6 +85,16 @@
}
};
+ // Test the use case of Url data model
+ if (index == context.photoUrls.length-1) {
+ eeDataModel = {
+ 'url' : context.photoUrls[index],
+ 'context' : {
+ "albumName": context.albumName,
+ "photoUrls": [context.photoUrls[index]]
+ }
+ };
+ }
var navigateCallback = function(site, metadata){currentSite = site; console.log("Nagivate callback");};
var returnCallback = function(returnValue){console.log("Return Value: " + returnValue);};
gadgets.views.openEmbeddedExperience(returnCallback, navigateCallback, eeDataModel, {'viewTarget' : 'preview'});
Modified: shindig/trunk/features/src/main/javascript/features/container.url/url_holder.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container.url/url_holder.js?rev=1158376&r1=1158375&r2=1158376&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container.url/url_holder.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container.url/url_holder.js Tue Aug 16 17:06:54 2011
@@ -128,7 +128,7 @@ osapi.container.UrlHolder.prototype.crea
'id' : this.iframeId_,
'name' : this.iframeId_,
'src' : this.getUrl(),
- 'scrolling' : 'yes',
+ 'scrolling' : 'auto',
'marginwidth' : '0',
'marginheight' : '0',
'frameborder' : '0',
Modified: shindig/trunk/features/src/main/javascript/features/open-views/viewenhancements-container.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/open-views/viewenhancements-container.js?rev=1158376&r1=1158375&r2=1158376&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/open-views/viewenhancements-container.js (original)
+++ shindig/trunk/features/src/main/javascript/features/open-views/viewenhancements-container.js Tue Aug 16 17:06:54 2011
@@ -178,6 +178,8 @@
* navigateCallback: Callback function to be called with the embedded
* experience has rendered.
* @param {Object}
+ * dataModel: The embedded experiences data model.
+ * @param {Object}
* opt_params: These are optional parameters which can be used to
* open gadgets. The following parameters may be included in this
* object. {string} viewTarget: The view that indicates where to open
@@ -186,63 +188,62 @@
*/
function openEE(resultCallback, navigateCallback, dataModel, opt_params) {
var gadgetUrl = dataModel.gadget;
- if (gadgetUrl) {
- //Check to make sure we can actually reach the gadget we are going to try
- //to render before we do anything else
- context.preloadGadget(gadgetUrl, function(result) {
- if (result[gadgetUrl] == null ||
- (result[gadgetUrl] != null && result[gadgetUrl].error)) {
- //There was an error, check to see if there is still the option to
- //render the url, else just call the navigateCallback
- if (!dataModel.url) {
- if (navigateCallback != null) {
- navigateCallback(null, result[gadgetUrl]);
- }
- return;
+
+ //Check to make sure we can actually reach the gadget we are going to try
+ //to render before we do anything else
+ context.preloadGadget(gadgetUrl, function(result) {
+ if (result[gadgetUrl] == null ||
+ (result[gadgetUrl] != null && result[gadgetUrl].error)) {
+ //There was an error, check to see if there is still the option to
+ //render the url, else just call the navigateCallback
+ if (!dataModel.url) {
+ if (navigateCallback != null) {
+ navigateCallback(null, result[gadgetUrl]);
}
+ return;
}
+ }
- var viewTarget = '';
- var viewParams = {};
- if (opt_params != undefined) {
- if (opt_params.viewTarget != undefined)
- viewTarget = opt_params.viewTarget;
- if (opt_params.viewParams != undefined)
- viewParams = opt_params.viewParams;
- }
+ var viewTarget = '';
+ var viewParams = {};
+ if (opt_params != undefined) {
+ if (opt_params.viewTarget != undefined)
+ viewTarget = opt_params.viewTarget;
+ if (opt_params.viewParams != undefined)
+ viewParams = opt_params.viewParams;
+ }
- var element = context.views.createElementForEmbeddedExperience(
- viewTarget);
+ var element = context.views.createElementForEmbeddedExperience(
+ viewTarget);
- var gadgetRenderParams = {};
- gadgetRenderParams[osapi.container.RenderParam.VIEW] =
- osapi.container.ee.RenderParam.EMBEDDED;
- gadgetRenderParams[osapi.container.RenderParam.WIDTH] = '100%';
- gadgetRenderParams[osapi.container.RenderParam.HEIGHT] = '100%';
-
- var urlRenderParams = {};
- urlRenderParams[osapi.container.RenderParam.WIDTH] = '100%';
- urlRenderParams[osapi.container.RenderParam.HEIGHT] = '100%';
-
- var eeRenderParams = {};
- eeRenderParams[osapi.container.ee.RenderParam.GADGET_RENDER_PARAMS] =
- gadgetRenderParams;
- eeRenderParams[osapi.container.ee.RenderParam.URL_RENDER_PARAMS] =
- urlRenderParams;
- eeRenderParams[osapi.container.ee.RenderParam.GADGET_VIEW_PARAMS] =
- viewParams;
-
- context.ee.navigate(element, dataModel, eeRenderParams, function(site,
- metadata) {
- if (metadata != null) {
- processSiteAndCallbackInfo(site, resultCallback);
- }
- if (navigateCallback != null) {
- navigateCallback(site, metadata);
- }
- });
- });
- }
+ var gadgetRenderParams = {};
+ gadgetRenderParams[osapi.container.RenderParam.VIEW] =
+ osapi.container.ee.RenderParam.EMBEDDED;
+ gadgetRenderParams[osapi.container.RenderParam.WIDTH] = '100%';
+ gadgetRenderParams[osapi.container.RenderParam.HEIGHT] = '100%';
+
+ var urlRenderParams = {};
+ urlRenderParams[osapi.container.RenderParam.WIDTH] = '100%';
+ urlRenderParams[osapi.container.RenderParam.HEIGHT] = '100%';
+
+ var eeRenderParams = {};
+ eeRenderParams[osapi.container.ee.RenderParam.GADGET_RENDER_PARAMS] =
+ gadgetRenderParams;
+ eeRenderParams[osapi.container.ee.RenderParam.URL_RENDER_PARAMS] =
+ urlRenderParams;
+ eeRenderParams[osapi.container.ee.RenderParam.GADGET_VIEW_PARAMS] =
+ viewParams;
+
+ context.ee.navigate(element, dataModel, eeRenderParams, function(site,
+ metadata) {
+ if (metadata != null) {
+ processSiteAndCallbackInfo(site, resultCallback);
+ }
+ if (navigateCallback != null) {
+ navigateCallback(site, metadata);
+ }
+ });
+ });
}
Modified: shindig/trunk/features/src/test/javascript/features/container.url/url_holder_test.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container.url/url_holder_test.js?rev=1158376&r1=1158375&r2=1158376&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/container.url/url_holder_test.js (original)
+++ shindig/trunk/features/src/test/javascript/features/container.url/url_holder_test.js Tue Aug 16 17:06:54 2011
@@ -50,7 +50,7 @@ UrlHolderTest.prototype.testRenderWithou
this.assertNull(holder.getIframeId());
holder.render(url, {});
this.assertEquals('<iframe' + ' marginwidth="0"' + ' hspace="0"' + ' frameborder="0"'
- + ' scrolling="yes"' + ' marginheight="0"' + ' vspace="0"' + ' id="__url_123"'
+ + ' scrolling="auto"' + ' marginheight="0"' + ' vspace="0"' + ' id="__url_123"'
+ ' name="__url_123"' + ' src="http://example.com"' + ' ></iframe>', element.innerHTML);
this.assertEquals(url, holder.getUrl());
this.assertEquals("__url_123", holder.getIframeId());
@@ -68,7 +68,7 @@ UrlHolderTest.prototype.testRenderWithPa
"height" : 104
});
this.assertEquals('<iframe' + ' marginwidth="0"' + ' hspace="0"' + ' height="104"'
- + ' frameborder="0"' + ' scrolling="yes"' + ' class="myClass"' + ' marginheight="0"'
+ + ' frameborder="0"' + ' scrolling="auto"' + ' class="myClass"' + ' marginheight="0"'
+ ' vspace="0"' + ' id="__url_123"' + ' width="54"' + ' name="__url_123"'
+ ' src="http://example.com"' + ' ></iframe>', element.innerHTML);
this.assertEquals(url, holder.getUrl());
Modified: shindig/trunk/features/src/test/javascript/features/container.url/url_site_test.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container.url/url_site_test.js?rev=1158376&r1=1158375&r2=1158376&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/container.url/url_site_test.js (original)
+++ shindig/trunk/features/src/test/javascript/features/container.url/url_site_test.js Tue Aug 16 17:06:54 2011
@@ -57,7 +57,7 @@ UrlSiteTest.prototype.testRenderNoParams
site.render(url, {});
this.assertNotNull(site.getActiveUrlHolder());
this.assertEquals('<iframe' + ' marginwidth="0"' + ' hspace="0"' + ' frameborder="0"'
- + ' scrolling="yes"' + ' marginheight="0"' + ' vspace="0"' + ' id="__url_0"'
+ + ' scrolling="auto"' + ' marginheight="0"' + ' vspace="0"' + ' id="__url_0"'
+ ' name="__url_0"' + ' src="http://example.com"' + ' ></iframe>', el.innerHTML);
};
@@ -75,7 +75,7 @@ UrlSiteTest.prototype.testRenderWithPara
});
this.assertNotNull(site.getActiveUrlHolder());
this.assertEquals('<iframe' + ' marginwidth="0"' + ' hspace="0"' + ' height="104"'
- + ' frameborder="0"' + ' scrolling="yes"' + ' class="myClass"' + ' marginheight="0"'
+ + ' frameborder="0"' + ' scrolling="auto"' + ' class="myClass"' + ' marginheight="0"'
+ ' vspace="0"' + ' id="__url_0"' + ' width="54"' + ' name="__url_0"'
+ ' src="http://example.com"' + ' ></iframe>', el.innerHTML);
};