Author: mhermanto
Date: Fri Feb 25 00:16:50 2011
New Revision: 1074360
URL: http://svn.apache.org/viewvc?rev=1074360&view=rev
Log:
Avoid over-obfuscation by runtime JS compiler, when property-obfuscation is
enabled.
http://codereview.appspot.com/4220047/
Modified:
shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js
shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
shindig/trunk/features/src/main/javascript/features/core.io/io.js
shindig/trunk/features/src/main/javascript/features/minimessage/minimessage.js
shindig/trunk/features/src/main/javascript/features/rpc/rpc.js
shindig/trunk/features/src/main/javascript/features/setprefs/setprefs.js
shindig/trunk/features/src/main/javascript/features/shindig.auth/auth.js
shindig/trunk/features/src/main/javascript/features/shindig.sha1/sha1.js
shindig/trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
shindig/trunk/features/src/main/javascript/features/skins/skins.js
shindig/trunk/features/src/main/javascript/features/tabs/tabs.js
shindig/trunk/features/src/main/javascript/features/views/views.js
Modified:
shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js
(original)
+++
shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js
Fri Feb 25 00:16:50 2011
@@ -520,20 +520,21 @@ OpenAjax.hub.IframeHubClient = function(
}
this._init = function() {
- var urlParams = OpenAjax.gadgets.util.getUrlParameters();
+ var oaGadgets = OpenAjax.gadgets;
+ var urlParams = oaGadgets.util.getUrlParameters();
if ( ! urlParams.parent ) {
// The RMR transport does not require a valid relay file, but does
need a URL
// in the parent's domain. The URL does not need to point to valid
file, so just
// point to 'robots.txt' file. See RMR transport code for more
info.
- var parent = urlParams.oahParent + "/robots.txt";
- OpenAjax.gadgets.rpc.setupReceiver( "..", parent );
+ var parent = urlParams['oahParent'] + "/robots.txt";
+ oaGadgets.rpc.setupReceiver( "..", parent );
}
if ( params.IframeHubClient &&
params.IframeHubClient.requireParentVerifiable &&
- OpenAjax.gadgets.rpc.getReceiverOrigin( ".." ) === null ) {
+ oaGadgets.rpc.getReceiverOrigin( ".." ) === null ) {
// If user set 'requireParentVerifiable' to true but RPC transport
does not
// support this, throw error.
- OpenAjax.gadgets.rpc.removeReceiver( ".." );
+ oaGadgets.rpc.removeReceiver( ".." );
throw new Error( OpenAjax.hub.Error.IncompatBrowser );
}
@@ -544,7 +545,7 @@ OpenAjax.hub.IframeHubClient = function(
// securityToken = generateSecurityToken( params, scope, log );
clientID = OpenAjax.gadgets.rpc.RPC_ID;
- if ( urlParams.oahId ) {
+ if ( urlParams['oahId'] ) {
clientID = clientID.substring( 0, clientID.lastIndexOf('_') );
}
};
Modified:
shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
(original)
+++
shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
Fri Feb 25 00:16:50 2011
@@ -67,7 +67,7 @@
IframeHubClient: {}
}
};
- if (gadgets.util.getUrlParameters().forcesecure) {
+ if (gadgets.util.getUrlParameters()['forcesecure']) {
gadgets.HubSettings.params.IframeHubClient.requireParentVerifiable =
true;
}
Modified: shindig/trunk/features/src/main/javascript/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.io/io.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.io/io.js (original)
+++ shindig/trunk/features/src/main/javascript/features/core.io/io.js Fri Feb
25 00:16:50 2011
@@ -404,10 +404,10 @@ gadgets.io = function() {
getSummaries: !!params.GET_SUMMARIES,
signOwner: signOwner,
signViewer: signViewer,
- gadget: urlParams.url,
- container: urlParams.container || urlParams.synd || 'default',
+ gadget: urlParams['url'],
+ container: urlParams['container'] || urlParams['synd'] || 'default',
// should we bypass gadget spec cache (e.g. to read OAuth provider
URLs)
- bypassSpecCache: gadgets.util.getUrlParameters().nocache || '',
+ bypassSpecCache: gadgets.util.getUrlParameters()['nocache'] || '',
getFullHeaders: !!params.GET_FULL_HEADERS
};
@@ -428,7 +428,7 @@ gadgets.io = function() {
}
}
- var proxyUrl = config.jsonProxyUrl.replace('%host%',
document.location.host);
+ var proxyUrl = config['jsonProxyUrl'].replace('%host%',
document.location.host);
// FIXME -- processResponse is not used in call
if (!respondWithPreload(paramData, params, callback)) {
@@ -525,12 +525,12 @@ gadgets.io = function() {
var rewriteMimeParam =
params.rewriteMime ? '&rewriteMime=' +
encodeURIComponent(params.rewriteMime) : '';
- var ret = config.proxyUrl.replace('%url%', encodeURIComponent(url)).
+ var ret = config['proxyUrl'].replace('%url%', encodeURIComponent(url)).
replace('%host%', document.location.host).
replace('%rawurl%', url).
replace('%refresh%', encodeURIComponent(refresh)).
- replace('%gadget%', encodeURIComponent(urlParams.url)).
- replace('%container%', encodeURIComponent(urlParams.container ||
urlParams.synd || 'default')).
+ replace('%gadget%', encodeURIComponent(urlParams['url'])).
+ replace('%container%', encodeURIComponent(urlParams['container'] ||
urlParams['synd'] || 'default')).
replace('%rewriteMime%', rewriteMimeParam);
if (ret.indexOf('//') == 0) {
ret = window.location.protocol + ret;
Modified:
shindig/trunk/features/src/main/javascript/features/minimessage/minimessage.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/minimessage/minimessage.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/minimessage/minimessage.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/minimessage/minimessage.js
Fri Feb 25 00:16:50 2011
@@ -212,7 +212,7 @@ gadgets.MiniMessage.prototype.dismissMes
// Injects the default stylesheet for mini-messages.
gadgets.config.register('minimessage', {}, function(configuration) {
// Injects the default stylesheet for mini-messages
- gadgets.MiniMessage.addCSS_(configuration.minimessage.css.join(''));
+ gadgets.MiniMessage.addCSS_(configuration['minimessage']['css'].join(''));
});
// Alias for legacy code
Modified: shindig/trunk/features/src/main/javascript/features/rpc/rpc.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/rpc/rpc.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/rpc/rpc.js (original)
+++ shindig/trunk/features/src/main/javascript/features/rpc/rpc.js Fri Feb 25
00:16:50 2011
@@ -442,7 +442,7 @@ if (!gadgets.rpc) { // make lib resilien
targetRelay = siblingId.origin;
} else if (id == '..') {
// parent
- targetRelay = params.parent;
+ targetRelay = params['parent'];
} else {
// child
targetRelay = document.getElementById(id).src;
@@ -528,7 +528,8 @@ if (!gadgets.rpc) { // make lib resilien
var targetEl = getTargetWin(target);
try {
// If this succeeds, then same-domain policy applied
- sameDomain[target] = targetEl.gadgets.rpc.receiveSameDomain;
+ var targetGadgets = targetEl['gadgets'];
+ sameDomain[target] = targetGadgets.rpc.receiveSameDomain;
} catch (e) {
// Shouldn't happen due to origin check. Caught to emit
// more meaningful error to the caller.
@@ -621,21 +622,21 @@ if (!gadgets.rpc) { // make lib resilien
function setupContainerGadgetContext(rpctoken, opt_forcesecure) {
function init(config) {
- var cfg = config ? config.rpc : {};
- var configLegacy = cfg.useLegacyProtocol;
+ var cfg = config ? config['rpc'] : {};
+ var configLegacy = cfg['useLegacyProtocol'];
if (typeof configLegacy === "string") {
configLegacy = configLegacy === "true";
}
// Parent-relative only.
- var parentRelayUrl = cfg.parentRelayUrl || "";
- parentRelayUrl = getOrigin(params.parent) + parentRelayUrl;
+ var parentRelayUrl = cfg['parentRelayUrl'] || "";
+ parentRelayUrl = getOrigin(params['parent']) + parentRelayUrl;
var useLegacy = !!configLegacy;
setRelayUrl('..', parentRelayUrl, useLegacy);
if (useLegacy) {
transport = gadgets.rpctx.ifpc;
transport.init(process, transportReady);
}
- setAuthToken('..', rpctoken, opt_forcesecure || params.forcesecure);
+ setAuthToken('..', rpctoken, opt_forcesecure || params['forcesecure']);
}
gadgets.config.register('rpc', null, init);
}
@@ -645,8 +646,8 @@ if (!gadgets.rpc) { // make lib resilien
// Use the opt_parent param if provided, or the "parent" query param
// if found -- otherwise, do nothing since this call might be initiated
// automatically at first, then actively later in IFRAME code.
- var forcesecure = opt_forcesecure || params.forcesecure || false;
- var parent = opt_parent || params.parent;
+ var forcesecure = opt_forcesecure || params['forcesecure'] || false;
+ var parent = opt_parent || params['parent'];
if (parent) {
setRelayUrl('..', parent);
setAuthToken('..', rpctoken, forcesecure);
@@ -673,8 +674,8 @@ if (!gadgets.rpc) { // make lib resilien
// The auth token is parsed from child params (rpctoken) or overridden.
var childParams = gadgets.util.getUrlParameters(relayUrl);
- var rpctoken = opt_authtoken || childParams.rpctoken;
- var forcesecure = opt_forcesecure || childParams.forcesecure;
+ var rpctoken = opt_authtoken || childParams['rpctoken'];
+ var forcesecure = opt_forcesecure || childParams['forcesecure'];
setAuthToken(gadgetId, rpctoken, forcesecure);
}
@@ -725,7 +726,7 @@ if (!gadgets.rpc) { // make lib resilien
function setupReceiver(targetId, opt_receiverurl, opt_authtoken,
opt_forcesecure) {
if (targetId === '..') {
// Gadget/IFRAME to container.
- var rpctoken = opt_authtoken || params.rpctoken || params.ifpctok ||
'';
+ var rpctoken = opt_authtoken || params['rpctoken'] ||
params['ifpctok'] || '';
if (window['__isgadget'] === true) {
setupContainerGadgetContext(rpctoken, opt_forcesecure);
} else {
Modified:
shindig/trunk/features/src/main/javascript/features/setprefs/setprefs.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/setprefs/setprefs.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/setprefs/setprefs.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/setprefs/setprefs.js
Fri Feb 25 00:16:50 2011
@@ -52,8 +52,8 @@ gadgets.Prefs.prototype.set = function(k
null, // go to parent
'set_pref', // service name
null, // no callback
- gadgets.util.getUrlParameters().ifpctok ||
- gadgets.util.getUrlParameters().rpctoken || 0 // Legacy IFPC
"security".
+ gadgets.util.getUrlParameters()['ifpctok'] ||
+ gadgets.util.getUrlParameters()['rpctoken'] || 0 // Legacy IFPC
"security".
].concat(Array.prototype.slice.call(arguments));
gadgets.rpc.call.apply(gadgets.rpc, args);
Modified:
shindig/trunk/features/src/main/javascript/features/shindig.auth/auth.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/shindig.auth/auth.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/shindig.auth/auth.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/shindig.auth/auth.js
Fri Feb 25 00:16:50 2011
@@ -139,10 +139,10 @@ shindig.Auth = function() {
// Auth token - might be injected into the gadget directly, or might
// be on the URL (hopefully on the fragment).
- if (config.authToken) {
- authToken = config.authToken;
- } else if (urlParams.st) {
- authToken = urlParams.st;
+ if (config['authToken']) {
+ authToken = config['authToken'];
+ } else if (urlParams['st']) {
+ authToken = urlParams['st'];
}
if (authToken !== null) {
addParamsToToken(urlParams);
@@ -150,8 +150,8 @@ shindig.Auth = function() {
// Trusted JSON. We use eval directly because this was injected by the
// container server and json parsing is slow in IE.
- if (config.trustedJson) {
- trusted = eval('(' + config.trustedJson + ')');
+ if (config['trustedJson']) {
+ trusted = eval('(' + config['trustedJson'] + ')');
}
}
Modified:
shindig/trunk/features/src/main/javascript/features/shindig.sha1/sha1.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/shindig.sha1/sha1.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/shindig.sha1/sha1.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/shindig.sha1/sha1.js
Fri Feb 25 00:16:50 2011
@@ -38,6 +38,8 @@
* @constructor
*/
shindig.sha1 = (function() {
+ var hex = '0123456789ABCDEF';
+
/**
* Holds the previous values of accumulated variables a-e in the compress_
* function.
Modified:
shindig/trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/shindig.xhrwrapper/xhrwrapper.js
Fri Feb 25 00:16:50 2011
@@ -137,12 +137,12 @@ shindig.xhrwrapper = shindig.xhrwrapper
this.requestHeaders_ = {};
this.responseHeaders_ = {};
- this.baseUrl_ = new Url(this.config_.contentUrl);
+ this.baseUrl_ = new Url(this.config_['contentUrl']);
this.fixRequestUrl_();
if (!this.baseUrl_.hasSameOrigin(this.url_)) {
- throw new Error('A gadget at ' + this.config_.contentUrl +
+ throw new Error('A gadget at ' + this.config_['contentUrl'] +
' tried to access ' + url + ' via XMLHttpRequest.');
}
@@ -176,14 +176,14 @@ shindig.xhrwrapper = shindig.xhrwrapper
params[gadgets.io.RequestParameters.HEADERS] = this.requestHeaders_;
params[gadgets.io.RequestParameters.GET_FULL_HEADERS] = true;
params[gadgets.io.RequestParameters.POST_DATA] = opt_data;
- if (this.config_.authorization) {
- if (this.config_.authorization == 'oauth') {
+ if (this.config_['authorization']) {
+ if (this.config_['authorization'] == 'oauth') {
params[gadgets.io.RequestParameters.AUTHORIZATION] =
gadgets.io.AuthorizationType.OAUTH;
- params[gadgets.io.RequestParameters.OAUTH_SERVICE_NAME] =
this.config_.oauthService;
- if (this.config_.oauthTokenName) {
- params[gadgets.io.RequestParameters.OAUTH_TOKEN_NAME] =
this.config_.oauthTokenName;
+ params[gadgets.io.RequestParameters.OAUTH_SERVICE_NAME] =
this.config_['oauthService'];
+ if (this.config_['oauthTokenName']) {
+ params[gadgets.io.RequestParameters.OAUTH_TOKEN_NAME] =
this.config_['oauthTokenName'];
}
- } else if (this.config_.authorization == 'signed') {
+ } else if (this.config_['authorization'] == 'signed') {
params[gadgets.io.RequestParameters.AUTHORIZATION] =
gadgets.io.AuthorizationType.SIGNED;
}
}
Modified: shindig/trunk/features/src/main/javascript/features/skins/skins.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/skins/skins.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/skins/skins.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/skins/skins.js Fri Feb
25 00:16:50 2011
@@ -34,7 +34,7 @@ gadgets.skins = function() {
};
gadgets.config.register('skins', requiredConfig, function(config) {
- skinProperties = config['skins'].properties;
+ skinProperties = config['skins']['properties'];
});
Modified: shindig/trunk/features/src/main/javascript/features/tabs/tabs.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/tabs/tabs.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/tabs/tabs.js (original)
+++ shindig/trunk/features/src/main/javascript/features/tabs/tabs.js Fri Feb 25
00:16:50 2011
@@ -128,7 +128,7 @@ gadgets.TabSet = function(opt_moduleId,
gadgets.config.register('tabset', {}, function(configuration) {
// Injects the default stylesheet for tabs
- gadgets.TabSet.addCSS_(configuration.tabs.css.join(''));
+ gadgets.TabSet.addCSS_(configuration['tabs']['css'].join(''));
});
Modified: shindig/trunk/features/src/main/javascript/features/views/views.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/views/views.js?rev=1074360&r1=1074359&r2=1074360&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/views/views.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/views/views.js Fri Feb
25 00:16:50 2011
@@ -94,7 +94,7 @@ gadgets.views = function() {
*
*/
function init(config) {
- var conf = config.views || {};
+ var conf = config['views'] || {};
for (var s in conf) {
if (conf.hasOwnProperty(s)) {
// TODO: Fix this by moving view names / config into a sub property.
@@ -106,9 +106,9 @@ gadgets.views = function() {
continue;
}
supportedViews[s] = new gadgets.views.View(s, obj.isOnlyVisible);
- var aliases = obj.aliases || [];
+ var aliases = obj['aliases'] || [];
for (var i = 0, alias; (alias = aliases[i]); ++i) {
- supportedViews[alias] = new gadgets.views.View(s,
obj.isOnlyVisible);
+ supportedViews[alias] = new gadgets.views.View(s,
obj['isOnlyVisible']);
}
}
}
@@ -119,7 +119,7 @@ gadgets.views = function() {
if (urlParams['view-params']) {
params = gadgets.json.parse(urlParams['view-params']) || params;
}
- currentView = supportedViews[urlParams.view] || supportedViews['default'];
+ currentView = supportedViews[urlParams['view']] ||
supportedViews['default'];
if (conf.rewriteLinks) {
gadgets.util.attachBrowserEvent(document, 'click', forceNavigate, false);
