svn commit: r1156249 - in /shindig/trunk: content/samplecontainer/examples/embeddedexperiences/EEContainer.js features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js

[rb...@apache.org]

Author: rbaxter85
Date: Wed Aug 10 16:18:22 2011
New Revision: 1156249

URL: http://svn.apache.org/viewvc?rev=1156249&view=rev
Log:
SHINDIG-1563
The RPC handler was the responsibility of the container to implement but there was nothing really container specific about it so I moved it to the feature code.  Also updated the reference implementations to reflect this change.

Modified:
    shindig/trunk/content/samplecontainer/examples/embeddedexperiences/EEContainer.js
    shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_container.js

Modified: shindig/trunk/content/samplecontainer/examples/embeddedexperiences/EEContainer.js
URL: http://svn.apache.org/viewvc/shindig/trunk/content/samplecontainer/examples/embeddedexperiences/EEContainer.js?rev=1156249&r1=1156248&r2=1156249&view=diff
==============================================================================
--- shindig/trunk/content/samplecontainer/examples/embeddedexperiences/EEContainer.js (original)
+++ shindig/trunk/content/samplecontainer/examples/embeddedexperiences/EEContainer.js Wed Aug 10 16:18:22 2011
@@ -16,18 +16,11 @@
  * specific language governing permissions and limitations under the License.
  */
 
-//The URL to request the activity stream
-var ACTIVITY_STREAMS_URL = 'http://localhost:8080/social/rest/activitystreams/john.doe/';
-
 //When the document is ready kick off the request so we can render the activity stream
 $(document).ready(function() {
-	var makeRequestParams = {'CONTENT_TYPE' : 'JSON', 'METHOD' : 'GET', 'POST_DATA' : {}};
-	gadgets.io.makeNonProxiedRequest(
-			ACTIVITY_STREAMS_URL,
-			function(response) {renderAS(response.data);},
-			makeRequestParams,
-			'application/javascript'
-	);
+  osapi.activitystreams.get({userId: 'john.doe'}).execute(function(response){
+    renderAS(response);
+  });
 });
 
 
@@ -36,8 +29,6 @@ $(document).ready(function() {
 var CommonContainer = new osapi.container.Container({});
 CommonContainer.init = new function() {
 
-	CommonContainer.rpcRegister('ee_gadget_rendered', gadgetRendered);
-
 	CommonContainer.views.createElementForEmbeddedExperience = function(opt_viewTarget) {
 	  return document.getElementById('preview');
 	};
@@ -48,29 +39,12 @@ CommonContainer.init = new function() {
 }
 
 /**
- * Handles the RPC request letting the container know that the embedded experience gadget is rendered.
- * @param rpcArgs the RPC args from the request.
- * @param data any data passed in from the caller.
- * @return void.
- */
-function gadgetRendered(rpcArgs, data) {
-	var gadgetSite = rpcArgs.gs;
-	var renderParams = gadgetSite.currentGadgetHolder_.renderParams_;
-	var eeDataModel = renderParams.eeDataModel;
-	var context = null;
-	if (eeDataModel) {
-		context = eeDataModel.context;
-	}
-	rpcArgs.callback(context);
-}
-
-/**
  * Renders the activity stream on the page
  * @param stream the activity stream json.
  * @return void.
  */
 function renderAS(stream) {
-	jQuery.each(stream.entry, createAccordianEntry);
+	jQuery.each(stream.list, createAccordianEntry);
 	$('#accordion').accordion({
 		clearStyle: true,
 		active: false,
@@ -111,7 +85,7 @@ function closeCurrentGadget() {
 function onAccordionChange(stream, event, ui) {
 	var id = ui.newHeader.context.id;
 	var localStream = stream;
-	var entry = localStream.entry[id];
+	var entry = localStream.list[id];
 	var extensions = entry.openSocial;
 	if (extensions) {
 		var embed = extensions.embed;

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=1156249&r1=1156248&r2=1156249&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 Wed Aug 10 16:18:22 2011
@@ -85,6 +85,21 @@
       }
     };
 
+    /**
+     * Handles the RPC request letting the container know that the embedded experience gadget is rendered.
+     * @param rpcArgs the RPC args from the request.
+     * @return void.
+     */
+    function gadgetRendered_(rpcArgs) {
+      var gadgetSite = rpcArgs.gs;
+      var renderParams = gadgetSite.currentGadgetHolder_.renderParams_;
+      var eeDataModel = renderParams.eeDataModel;
+      return eeDataModel ? eeDataModel.context : null;
+    };
+
+    //Add the RPC handler to pass the context to the gadget
+    context.rpcRegister('ee_gadget_rendered', gadgetRendered_);
+
     return {
 
       /**