Author: mhermanto
Date: Fri Mar 4 01:46:07 2011
New Revision: 1076919
URL: http://svn.apache.org/viewvc?rev=1076919&view=rev
Log:
Avoid prop obfuscation on more variables.
http://codereview.appspot.com/4264042/
Modified:
shindig/trunk/features/src/main/javascript/features/osapi/batch.js
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
shindig/trunk/features/src/main/javascript/features/osapi/osapi.js
Modified: shindig/trunk/features/src/main/javascript/features/osapi/batch.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/batch.js?rev=1076919&r1=1076918&r2=1076919&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/osapi/batch.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/osapi/batch.js Fri Mar
4 01:46:07 2011
@@ -61,7 +61,7 @@
* @param {Object} request
*/
var toJsonRpc = function(request) {
- var jsonRpc = {method: request.request.method, id: request.key};
+ var jsonRpc = { 'method': request.request.method, 'id': request.key};
if (request.request.rpc) {
jsonRpc.params = request.request.rpc;
}
@@ -86,35 +86,35 @@
var transports = [];
for (var i = 0; i < keyedRequests.length; i++) {
// Batch requests per-transport
- var transport = keyedRequests[i].request.transport;
- if (!perTransportBatch[transport.name]) {
+ var transport = keyedRequests[i]['request']['transport'];
+ if (!perTransportBatch[transport['name']]) {
transports.push(transport);
latchCount++;
}
- perTransportBatch[transport.name] = perTransportBatch[transport.name]
|| [];
+ perTransportBatch[transport['name']] =
perTransportBatch[transport['name']] || [];
// Transform the request into JSON-RPC form before sending to the
transport
- perTransportBatch[transport.name].push(toJsonRpc(keyedRequests[i]));
+ perTransportBatch[transport['name']].push(toJsonRpc(keyedRequests[i]));
}
// Define callback for transports
var transportCallback = function(transportBatchResult) {
- if (transportBatchResult.error) {
- batchResult.error = transportBatchResult.error;
+ if (transportBatchResult['error']) {
+ batchResult['error'] = transportBatchResult['error'];
}
// Merge transport results into overall result and hoist data.
// All transport results are required to be of the format
// { <key> : <JSON-RPC response>, ...}
for (var i = 0; i < keyedRequests.length; i++) {
- var key = keyedRequests[i].key;
+ var key = keyedRequests[i]['key'];
var response = transportBatchResult[key];
if (response) {
- if (response.error) {
+ if (response['error']) {
// No need to hoist error responses
batchResult[key] = response;
} else {
// Handle both compliant and non-compliant JSON-RPC data
responses.
- batchResult[key] = response.data || response.result;
+ batchResult[key] = response['data'] || response['result'];
}
}
}
@@ -128,7 +128,7 @@
// For each transport execute its local batch of requests
for (var j = 0; j < transports.length; j++) {
- transports[j].execute(perTransportBatch[transports[j].name],
transportCallback);
+ transports[j].execute(perTransportBatch[transports[j]['name']],
transportCallback);
}
// Force the callback to occur asynchronously even if there were no
actual calls
Modified:
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js?rev=1076919&r1=1076918&r2=1076919&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
Fri Mar 4 01:46:07 2011
@@ -52,7 +52,7 @@ if (gadgets && gadgets.rpc) { //Dont bin
}
function init(config) {
- var transport = { name: 'gadgets.rpc', 'execute' : execute };
+ var transport = { 'name': 'gadgets.rpc', 'execute' : execute };
var services = config['osapi.services'];
if (services) {
// Iterate over the defined services, extract the gadget.rpc endpoint
and
Modified:
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js?rev=1076919&r1=1076918&r2=1076919&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
Fri Mar 4 01:46:07 2011
@@ -30,24 +30,23 @@
* @param {function(Object)} callback
*/
function execute(requests, callback) {
-
function processResponse(response) {
// Convert an XHR failure to a JSON-RPC error
- if (response.errors[0]) {
+ if (response['errors'][0]) {
callback({
error: {
- code: response.rc,
- message: response.text
+ 'code': response['rc'],
+ 'message': response['text']
}
});
} else {
- var jsonResponse = response.result || response.data;
- if (jsonResponse.error) {
+ var jsonResponse = response['result'] || response['data'];
+ if (jsonResponse['error']) {
callback(jsonResponse);
} else {
var responseMap = {};
for (var i = 0; i < jsonResponse.length; i++) {
- responseMap[jsonResponse[i].id] = jsonResponse[i];
+ responseMap[jsonResponse[i]['id']] = jsonResponse[i];
}
callback(responseMap);
}
@@ -87,7 +86,7 @@
endpointName.indexOf('//') == 0) {
// Expand the host & append the security token
var endpointUrl = endpointName.replace('%host%',
document.location.host);
- var transport = { name: endpointUrl, 'execute' : execute };
+ var transport = { 'name' : endpointUrl, 'execute' : execute };
var methods = services[endpointName];
for (var i = 0; i < methods.length; i++) {
osapi._registerMethod(methods[i], transport);
Modified: shindig/trunk/features/src/main/javascript/features/osapi/osapi.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/osapi.js?rev=1076919&r1=1076918&r2=1076919&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/osapi/osapi.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/osapi/osapi.js Fri Mar
4 01:46:07 2011
@@ -60,13 +60,13 @@
// TODO: This shouldnt really be necessary. The spec should be clear
enough about
// defaults that we dont have to populate this.
rpc = rpc || {};
- rpc.userId = rpc.userId || '@viewer';
- rpc.groupId = rpc.groupId || '@self';
+ rpc['userId'] = rpc['userId'] || '@viewer';
+ rpc['groupId'] = rpc['groupId'] || '@self';
// Decorate the execute method with the information necessary for
batching
- boundCall.method = method;
- boundCall.transport = transport;
- boundCall.rpc = rpc;
+ boundCall['method'] = method;
+ boundCall['transport'] = transport;
+ boundCall['rpc'] = rpc;
return boundCall;
};
@@ -75,7 +75,7 @@
}
if (last[parts[parts.length - 1]]) {
- gadgets.warn('Skipping duplicate osapi method definition ' + method + '
on transport ' + transport.name);
+ gadgets.warn('Skipping duplicate osapi method definition ' + method + '
on transport ' + transport['name']);
} else {
last[parts[parts.length - 1]] = apiMethod;
}
