Author: rbaxter85
Date: Tue Aug 9 00:55:47 2011
New Revision: 1155177
URL: http://svn.apache.org/viewvc?rev=1155177&view=rev
Log:
Issue 1561
osapi.container.ee.RenderParam object had an s at the end of it which did not
follow the conventions of osapi.container.RenderParam
Modified:
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/constant.js
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml
shindig/trunk/features/src/main/javascript/features/open-views/viewenhancements-container.js
Modified:
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/constant.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/embeddedexperiences/constant.js?rev=1155177&r1=1155176&r2=1155177&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/constant.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/constant.js
Tue Aug 9 00:55:47 2011
@@ -31,7 +31,7 @@ osapi.container.ee = {};
* Rendering params for an embedded experience
* @enum {string}
*/
-osapi.container.ee.RenderParams = {
+osapi.container.ee.RenderParam = {
GADGET_RENDER_PARAMS: 'gadgetRenderParams',
GADGET_VIEW_PARAMS: 'gadgetViewParams',
URL_RENDER_PARAMS: 'urlRenderParams',
Modified:
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js?rev=1155177&r1=1155176&r2=1155177&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js
Tue Aug 9 00:55:47 2011
@@ -34,12 +34,12 @@
*/
function navigateGadget_(element, dataModel,
renderParams, opt_callback) {
- var viewParams =
renderParams[osapi.container.ee.RenderParams.GADGET_VIEW_PARAMS] || {};
+ var viewParams =
renderParams[osapi.container.ee.RenderParam.GADGET_VIEW_PARAMS] || {};
var localRenderParams =
- renderParams[osapi.container.ee.RenderParams.GADGET_RENDER_PARAMS] ||
{};
- localRenderParams[osapi.container.ee.RenderParams.DATA_MODEL] =
dataModel;
+ renderParams[osapi.container.ee.RenderParam.GADGET_RENDER_PARAMS] ||
{};
+ localRenderParams[osapi.container.ee.RenderParam.DATA_MODEL] = dataModel;
localRenderParams[osapi.container.RenderParam.VIEW] =
- osapi.container.ee.RenderParams.EMBEDDED;
+ osapi.container.ee.RenderParam.EMBEDDED;
var site = context.newGadgetSite(element);
var gadgetUrl = dataModel.gadget;
@@ -77,7 +77,7 @@
*/
function navigateUrl_(element, dataModel, renderParams, opt_callback) {
var urlRenderParams =
- renderParams[osapi.container.ee.RenderParams.URL_RENDER_PARAMS] || {};
+ renderParams[osapi.container.ee.RenderParam.URL_RENDER_PARAMS] || {};
var site = context.newUrlSite(element);
var toReturn = context.navigateUrl(site, dataModel.url, urlRenderParams);
if (opt_callback) {
Modified:
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml?rev=1155177&r1=1155176&r2=1155177&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml
(original)
+++
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/feature.xml
Tue Aug 9 00:55:47 2011
@@ -32,11 +32,11 @@ specific language governing permissions
<exports type="js">osapi.container.Container.ee</exports>
<exports type="js">osapi.container.Container.ee.navigate</exports>
<exports type="js">osapi.container.Container.ee.close</exports>
- <exports
type="js">osapi.container.ee.RenderParams.GADGET_RENDER_PARAMS</exports>
- <exports
type="js">osapi.container.ee.RenderParams.GADGET_VIEW_PARAMS</exports>
- <exports
type="js">osapi.container.ee.RenderParams.URL_RENDER_PARAMS</exports>
- <exports
type="js">osapi.container.ee.RenderParams.DATA_MODEL</exports>
- <exports
type="js">osapi.container.ee.RenderParams.EMBEDDED</exports>
+ <exports
type="js">osapi.container.ee.RenderParam.GADGET_RENDER_PARAMS</exports>
+ <exports
type="js">osapi.container.ee.RenderParam.GADGET_VIEW_PARAMS</exports>
+ <exports
type="js">osapi.container.ee.RenderParam.URL_RENDER_PARAMS</exports>
+ <exports
type="js">osapi.container.ee.RenderParam.DATA_MODEL</exports>
+ <exports
type="js">osapi.container.ee.RenderParam.EMBEDDED</exports>
</api>
</container>
</feature>
\ No newline at end of file
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=1155177&r1=1155176&r2=1155177&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 9 00:55:47 2011
@@ -216,7 +216,7 @@
var gadgetRenderParams = {};
gadgetRenderParams[osapi.container.RenderParam.VIEW] =
- osapi.container.ee.RenderParams.EMBEDDED;
+ osapi.container.ee.RenderParam.EMBEDDED;
gadgetRenderParams[osapi.container.RenderParam.WIDTH] = '100%';
gadgetRenderParams[osapi.container.RenderParam.HEIGHT] = '100%';
@@ -225,11 +225,11 @@
urlRenderParams[osapi.container.RenderParam.HEIGHT] = '100%';
var eeRenderParams = {};
- eeRenderParams[osapi.container.ee.RenderParams.GADGET_RENDER_PARAMS] =
+ eeRenderParams[osapi.container.ee.RenderParam.GADGET_RENDER_PARAMS] =
gadgetRenderParams;
- eeRenderParams[osapi.container.ee.RenderParams.URL_RENDER_PARAMS] =
+ eeRenderParams[osapi.container.ee.RenderParam.URL_RENDER_PARAMS] =
urlRenderParams;
- eeRenderParams[osapi.container.ee.RenderParams.GADGET_VIEW_PARAMS] =
+ eeRenderParams[osapi.container.ee.RenderParam.GADGET_VIEW_PARAMS] =
viewParams;
context.ee.navigate(element, dataModel, eeRenderParams, function(site,
