Author: ddumont
Date: Fri Sep 14 15:29:26 2012
New Revision: 1384822
URL: http://svn.apache.org/viewvc?rev=1384822&view=rev
Log:
SHINDIG-1868 - Gadget-side feature code rpc checking
Committed for Robert O'Neill
Modified:
shindig/trunk/features/src/main/javascript/features/actions/actions.js
shindig/trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
shindig/trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
shindig/trunk/features/src/main/javascript/features/pubsub/pubsub.js
shindig/trunk/features/src/main/javascript/features/selection/selection.js
Modified: shindig/trunk/features/src/main/javascript/features/actions/actions.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/actions/actions.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/actions/actions.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/actions/actions.js Fri
Sep 14 15:29:26 2012
@@ -47,6 +47,9 @@ gadgets['actions'] = (function() {
gadgets.util.registerOnLoadHandler(function() {
// register rpc endpoint
gadgets.rpc.register('actions.runAction', function(id, selection) {
+ if (this.f !== '..') {
+ return;
+ }
var callback = callbackRegistry.getCallback(id);
if (callback) {
callback.call(this, selection);
@@ -221,6 +224,9 @@ gadgets['actions'] = (function() {
if (!showListeners) {
showListeners = [];
gadgets.rpc.register('actions.onActionShow', function(actions) {
+ if (this.f !== '..') {
+ return;
+ }
for (var i = 0, listener; listener = showListeners[i]; i++) {
listener(actions);
}
@@ -244,6 +250,9 @@ gadgets['actions'] = (function() {
if (!hideListeners) {
hideListeners = [];
gadgets.rpc.register('actions.onActionHide', function(actions) {
+ if (this.f !== '..') {
+ return;
+ }
for (var i = 0, listener; listener = hideListeners[i]; i++) {
listener(actions);
}
Modified:
shindig/trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/auth-refresh/auth-refresh.js
Fri Sep 14 15:29:26 2012
@@ -22,5 +22,8 @@
* @fileoverview Allows the container to refresh the gadget security token.
*/
gadgets.rpc.register('update_security_token', function(token) {
+ if (this.f !== '..') {
+ return;
+ }
shindig.auth.updateSecurityToken(token);
});
Modified:
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/embeddedexperiences/embedded_experiences_gadgets.js
Fri Sep 14 15:29:26 2012
@@ -30,6 +30,9 @@ gadgets['ee'] = gadgets['ee'] || {};
* The embedded experiences context.
*/
function setDataContext(context) {
+ if (this.f !== '..') {
+ return;
+ }
opensocial.data.DataContext.putDataSet('org.opensocial.ee.context',
context);
};
Modified:
shindig/trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/open-views.results/open-views-results-gadget.js
Fri Sep 14 15:29:26 2012
@@ -28,6 +28,9 @@ gadgets.views = gadgets.views || {};
gadgets.util.registerOnLoadHandler(function() {
gadgets.rpc.register('gadgets.views.deliverResult', function(rcbnum,
result) {
+ if (this.f !== '..') {
+ return;
+ }
var resultCallback;
if (resultCallback = resultCallbackMap[rcbnum]) {
delete resultCallbackMap[rcbnum];
Modified:
shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/opensocial-jsonrpc/jsonrpccontainer.js
Fri Sep 14 15:29:26 2012
@@ -115,6 +115,9 @@ var JsonRpcRequestItem = function(rpc, o
*/
JsonRpcContainer.requestShareAppCallback_ = function(callbackId,
success, opt_errorCode, recipientIds) {
+ if (this.f !== '..') {
+ return;
+ }
callback = callbackIdStore[callbackId];
if (callback) {
callbackIdStore[callbackId] = null;
Modified: shindig/trunk/features/src/main/javascript/features/pubsub/pubsub.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/pubsub/pubsub.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/pubsub/pubsub.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/pubsub/pubsub.js Fri
Sep 14 15:29:26 2012
@@ -29,6 +29,9 @@ gadgets.pubsub = function() {
var listeners = {};
function router(channel, sender, message) {
+ if (this.f !== '..') {
+ return;
+ }
var listener = listeners[channel];
if (typeof listener === 'function') {
listener(sender, message);
Modified:
shindig/trunk/features/src/main/javascript/features/selection/selection.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/selection/selection.js?rev=1384822&r1=1384821&r2=1384822&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/selection/selection.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/selection/selection.js
Fri Sep 14 15:29:26 2012
@@ -44,6 +44,9 @@ gadgets['selection'] = function() {
gadgets.util.registerOnLoadHandler(function() {
gadgets.rpc.register('gadgets.selection.selectionChanged',
function(selection) {
+ if (this.f !== '..') {
+ return;
+ }
currentSelection = selection;
for (var i=0, currentListener; currentListener=listeners[i]; i++) {
listeners[i](selection);
