Author: rbaxter85
Date: Thu Feb 14 22:49:01 2013
New Revision: 1446375
URL: http://svn.apache.org/r1446375
Log:
SHINDIG-1901
Committed For Erin Noe-Payne
SHINDIG-1901 container.preloadCaches() should fire ON_PRELOAD lifecycle handlers
Modified:
shindig/trunk/features/src/main/javascript/features/container/container.js
shindig/trunk/features/src/main/javascript/features/opensearch/opensearch.js
shindig/trunk/features/src/test/javascript/features/container/container_test.js
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=1446375&r1=1446374&r2=1446375&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/container.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/container.js
Thu Feb 14 22:49:01 2013
@@ -494,10 +494,18 @@ osapi.container.Container.prototype.prel
preloadData, osapi.container.ContainerConfig.PRELOAD_TOKENS, {});
var refTime = osapi.container.util.getSafeJsonValue(
preloadData, osapi.container.ContainerConfig.PRELOAD_REF_TIME, null);
+ var gadgetUrls = [];//keys of gadgets
+ for(var k in gadgets) {
+ if (gadgets.hasOwnProperty(k)){
+ gadgetUrls.push(k);
+ }
+ }
+
this.applyLifecycleCallbacks_(osapi.container.CallbackType.ON_BEFORE_PRELOAD,
gadgetUrls);
this.service_.addGadgetMetadatas(gadgets, refTime);
this.service_.addGadgetTokens(tokens, refTime);
this.addPreloadGadgets_(gadgets, tokens);
+ this.applyLifecycleCallbacks_(osapi.container.CallbackType.ON_PRELOADED,
gadgets);
};
Modified:
shindig/trunk/features/src/main/javascript/features/opensearch/opensearch.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/opensearch/opensearch.js?rev=1446375&r1=1446374&r2=1446375&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/opensearch/opensearch.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/opensearch/opensearch.js
Thu Feb 14 22:49:01 2013
@@ -104,7 +104,7 @@
*/
function preloaded(response) {
for (var item in response) {
- if (!response[item].error) {
+ if (!response[item].error && response[item].modulePrefs) {
// check for os feature
var feature = response[item].modulePrefs.features['opensearch'];
var title = response[item].modulePrefs.title;
Modified:
shindig/trunk/features/src/test/javascript/features/container/container_test.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/container/container_test.js?rev=1446375&r1=1446374&r2=1446375&view=diff
==============================================================================
---
shindig/trunk/features/src/test/javascript/features/container/container_test.js
(original)
+++
shindig/trunk/features/src/test/javascript/features/container/container_test.js
Thu Feb 14 22:49:01 2013
@@ -100,6 +100,7 @@ ContainerTest.prototype.testPreloadCache
container.addPreloadGadgets_ = function(gadgets) {
self.assertEquals(mockMetadata, gadgets);
};
+ container.applyLifecycleCallbacks_ = function() {};
container.preloadCaches({
'preloadMetadatas' : mockMetadata,
'preloadTokens' : mockMetadata
