Author: hsaputra
Date: Sat Jul 21 00:12:24 2012
New Revision: 1364025
URL: http://svn.apache.org/viewvc?rev=1364025&view=rev
Log:
Make common container sample container work for IE7
Modified:
shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js
shindig/trunk/content/samplecontainer/examples/commoncontainer/viewController.js
shindig/trunk/content/samplecontainer/examples/conservcontainer/viewController.js
Modified:
shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js?rev=1364025&r1=1364024&r2=1364025&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js
(original)
+++ shindig/trunk/content/samplecontainer/examples/commoncontainer/assembler.js
Sat Jul 21 00:12:24 2012
@@ -29,7 +29,7 @@ testConfig[osapi.container.ContainerConf
// the DefaultSecurityTokenCodec to let UrlParameterAuthenticationHandler
create valid security token.
// 10 seconds is fast, but this is mostly for demonstration purposes.
testConfig[osapi.container.ContainerConfig.GET_CONTAINER_TOKEN] =
function(callback) {
- console.log('Updating container security token.');
+ gadgets.log('Updating container security token.');
callback('john.doe:john.doe:appid:cont:url:0:default', 10);
};
@@ -63,7 +63,7 @@ CommonContainer.init = function() {
hub: CommonContainer.managedHub
});
- CommonContainer.rpcRegister('set_title', setTitleHandler);
+ CommonContainer.rpcRegister('set_title', window.setTitleHandler);
CommonContainer.addGadgetLifecycleCallback('com.example.commoncontainer',
lifecycle());
try {
Modified:
shindig/trunk/content/samplecontainer/examples/commoncontainer/viewController.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/commoncontainer/viewController.js?rev=1364025&r1=1364024&r2=1364025&view=diff
==============================================================================
---
shindig/trunk/content/samplecontainer/examples/commoncontainer/viewController.js
(original)
+++
shindig/trunk/content/samplecontainer/examples/commoncontainer/viewController.js
Sat Jul 21 00:12:24 2012
@@ -99,12 +99,12 @@ $(function() {
};
//RPC handler for the set-title feature
- setTitleHandler = function(rpcArgs, title) {
+ window.setTitleHandler = function(rpcArgs, title) {
var titleId = siteToTitleMap[rpcArgs.gs.id_];
$('#' + titleId).text(title);
};
- getNewGadgetElement = function(result, gadgetURL){
+ window.getNewGadgetElement = function(result, gadgetURL){
result[gadgetURL] = result[gadgetURL] || {};
var gadgetSiteString =
"$(this).closest(\'.portlet\').find(\'.portlet-content\').data(\'gadgetSite\')";
var viewItems = '';
@@ -137,9 +137,9 @@ $(function() {
}
//create a gadget with navigation tool bar header enabling gadget
collapse, expand, remove, navigate to view actions.
- buildGadget = function(result,gadgetURL){
+ window.buildGadget = function(result,gadgetURL){
result = result || {};
- var element = getNewGadgetElement(result, gadgetURL);
+ var element = window.getNewGadgetElement(result, gadgetURL);
$(element).data('gadgetSite', CommonContainer.renderGadget(gadgetURL,
curId));
//determine which button was click and handle the appropriate event.
@@ -168,7 +168,7 @@ $(function() {
CommonContainer.preloadGadget(newGadgetUrl.val(),
function(result) {
for (var gadgetURL in result) {
if(!result[gadgetURL].error) {
- buildGadget(result, gadgetURL);
+ window.buildGadget(result, gadgetURL);
curId++;
}
}
@@ -185,7 +185,7 @@ $(function() {
CommonContainer.preloadGadget(newGadgetUrl.val(), function(result) {
for (var gadgetURL in result) {
if(!result[gadgetURL].error) {
- //buildGadget(result, gadgetURL);
+ //window.buildGadget(result, gadgetURL);
curId++;
}
}
@@ -199,7 +199,7 @@ $(function() {
// Add a single gadget entered by user (no preloading)
$('#addGadget').click(function() {
- buildGadget({}, newGadgetUrl.val());
+ window.buildGadget({}, newGadgetUrl.val());
curId++;
//Clear Values
@@ -216,7 +216,7 @@ $(function() {
CommonContainer.preloadGadgets(testGadgets, function(result) {
for (var gadgetURL in result) {
if(!result[gadgetURL].error) {
- buildGadget(result, gadgetURL);
+ window.buildGadget(result, gadgetURL);
curId++;
}
}
@@ -230,7 +230,7 @@ $(function() {
CommonContainer.preloadGadgets(eeUrl.val(), function(result) {
for (var gadgetURL in result) {
if(!result[gadgetURL].error) {
- var eeElement = getNewGadgetElement(result, gadgetURL);
+ var eeElement = window.getNewGadgetElement(result, gadgetURL);
var model = new Object();
@@ -240,7 +240,7 @@ $(function() {
var params = [];
params[osapi.container.ee.RenderParam.GADGET_RENDER_PARAMS] = {
'height' : eeHeight.val(),
- 'width' : eeWidth.val(),
+ 'width' : eeWidth.val()
};
var currentEESite = CommonContainer.ee.navigate(eeElement,
model, params, null);
curId++;
Modified:
shindig/trunk/content/samplecontainer/examples/conservcontainer/viewController.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/conservcontainer/viewController.js?rev=1364025&r1=1364024&r2=1364025&view=diff
==============================================================================
---
shindig/trunk/content/samplecontainer/examples/conservcontainer/viewController.js
(original)
+++
shindig/trunk/content/samplecontainer/examples/conservcontainer/viewController.js
Sat Jul 21 00:12:24 2012
@@ -69,7 +69,7 @@ $(function() {
// Create a gadget with navigation tool bar header
// enabling gadget collapse, expand and remove.
- buildGadget = function(result,gadgetURL,lazyload) {
+ window.buildGadget = function(result,gadgetURL,lazyload) {
var gadgetSiteString = "$(this).closest(\'.portlet\')." +
"find(\'.portlet-content\').data(\'gadgetSite\')";
var newGadgetSite = gadgetTemplate;
@@ -110,7 +110,7 @@ $(function() {
addGadget = function(gadgetUrl, lazyload) {
CommonContainer.preloadGadget(gadgetUrl, function(result) {
for (var gadgetURL in result) {
- buildGadget(result, gadgetURL, lazyload);
+ window.buildGadget(result, gadgetURL, lazyload);
curId++;
}
});
