Author: rbaxter85
Date: Wed Oct 19 17:16:30 2011
New Revision: 1186350
URL: http://svn.apache.org/viewvc?rev=1186350&view=rev
Log:
SHINDIG-1644
Committed For Matt Hatem
Containers should be able to override a subset of the rpc handlers of the
actions feature.
Modified:
shindig/trunk/features/src/main/javascript/features/actions/actions.js
shindig/trunk/features/src/main/javascript/features/actions/actions_container.js
shindig/trunk/features/src/test/javascript/features/actions/actions_test.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=1186350&r1=1186349&r2=1186350&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/actions/actions.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/actions/actions.js Wed
Oct 19 17:16:30 2011
@@ -150,7 +150,7 @@ gadgets['actions'] = (function() {
*/
runAction: function(actionId, opt_selection) {
actionData = {"id" : actionId, "selection" : opt_selection};
- gadgets.rpc.call('..', 'actions', null, 'runAction', actionData);
+ gadgets.rpc.call('..', 'run_action', null, actionData);
},
/**
@@ -197,7 +197,7 @@ gadgets['actions'] = (function() {
* @member gadgets.actions
*/
getActionsByPath: function(path, callback) {
- gadgets.rpc.call('..', 'actions', callback, 'getActionsByPath', path);
+ gadgets.rpc.call('..', 'get_actions_by_path', callback, path);
},
/**
@@ -222,8 +222,7 @@ gadgets['actions'] = (function() {
* @member gadgets.actions
*/
getActionsByDataType: function(dataType, callback) {
- gadgets.rpc.call('..', 'actions', callback, 'getActionsByDataType',
- dataType);
+ gadgets.rpc.call('..', 'get_actions_by_type', callback, dataType);
},
/**
Modified:
shindig/trunk/features/src/main/javascript/features/actions/actions_container.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/actions/actions_container.js?rev=1186350&r1=1186349&r2=1186350&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/actions/actions_container.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/actions/actions_container.js
Wed Oct 19 17:16:30 2011
@@ -560,21 +560,23 @@
unloadedCallback;
// Function to handle RPC calls from the gadgets side
+ function router_get_actions_by_type(object) {
+ return container_.actions.getActionsByDataType(object);
+ }
+ function router_get_actions_by_path(object) {
+ return container_.actions.getActionsByPath(object);
+ }
+ function router_run_action(object) {
+ container_.actions.runAction(object.id, object.selection);
+ }
function router(channel, object) {
switch (channel) {
case 'bindAction':
bindAction(object);
break;
- case 'runAction':
- container_.actions.runAction(object.id, object.selection);
- break;
case 'removeAction':
hideActionHandlerProxy([object]);
break;
- case 'getActionsByPath':
- return container_.actions.getActionsByPath(object);
- case 'getActionsByDataType':
- return container_.actions.getActionsByDataType(object);
case 'addShowActionListener':
addShowActionListener(object);
break;
@@ -656,6 +658,9 @@
osapi.container.Container.addMixin('actions', function(container) {
container_ = container;
gadgets.rpc.register('actions', router);
+ gadgets.rpc.register('get_actions_by_type', router_get_actions_by_type);
+ gadgets.rpc.register('get_actions_by_path', router_get_actions_by_path);
+ gadgets.rpc.register('run_action', router_run_action);
if (container.addGadgetLifecycleCallback) {
container.addGadgetLifecycleCallback('actions',
Modified:
shindig/trunk/features/src/test/javascript/features/actions/actions_test.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/actions/actions_test.js?rev=1186350&r1=1186349&r2=1186350&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/actions/actions_test.js
(original)
+++ shindig/trunk/features/src/test/javascript/features/actions/actions_test.js
Wed Oct 19 17:16:30 2011
@@ -76,8 +76,8 @@ DeclarativeActionsTest.prototype.testGad
var actionId = "testAction";
var opt_selection = "testSelection";
gadgets.actions.runAction(actionId, opt_selection);
- this.assertRpcCalled('..', 'actions', null,
- 'runAction', {"id":actionId, "selection":opt_selection});
+ this.assertRpcCalled('..', 'run_action', null,
+ {"id":actionId, "selection":opt_selection});
};
