Author: lindner
Date: Wed Jun 8 01:12:46 2011
New Revision: 1133229
URL: http://svn.apache.org/viewvc?rev=1133229&view=rev
Log:
gjslint fixups
Modified:
shindig/trunk/features/src/main/javascript/features/cloo/cloo.js
shindig/trunk/features/src/main/javascript/features/container/constant.js
shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js
shindig/trunk/features/src/main/javascript/features/container/gadget_site.js
shindig/trunk/features/src/main/javascript/features/container/init.js
shindig/trunk/features/src/main/javascript/features/container/service.js
shindig/trunk/features/src/main/javascript/features/container/util.js
shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
shindig/trunk/features/src/main/javascript/features/core.io/io.js
shindig/trunk/features/src/main/javascript/features/osapi.base/batch.js
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
shindig/trunk/features/src/main/javascript/features/rpc/flash.transport.js
shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
shindig/trunk/features/src/main/javascript/features/rpc/rpc.js
shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js
Modified: shindig/trunk/features/src/main/javascript/features/cloo/cloo.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/cloo/cloo.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/cloo/cloo.js (original)
+++ shindig/trunk/features/src/main/javascript/features/cloo/cloo.js Wed Jun 8
01:12:46 2011
@@ -24,7 +24,7 @@
* Method overrides are actually method overwrites, and importantly there's
* no such thing as private state: all properties attached to "this" are public
* and accessible.
- *
+ *
* With this library, object-oriented JS APIs are implemented as function
* closures with private internal variables. Exported APIs are returned from
* these as Objects themselves.
@@ -91,12 +91,12 @@
*/
var cloo = (function() {
- var UNKNOWN_NAME = "(n/a)";
+ var UNKNOWN_NAME = '(n/a)';
var selfs = [];
function InterfaceMethod(className, methodName) {
return function() {
- throw "Class " + className + " missing " + methodName + "()";
+ throw 'Class ' + className + ' missing ' + methodName + '()';
}
}
@@ -107,14 +107,14 @@ var cloo = (function() {
}
function hasOwnFunctionProperty(obj, key) {
- return obj.hasOwnProperty(key) && typeof obj[key] === "function";
+ return obj.hasOwnProperty(key) && typeof obj[key] === 'function';
}
function objectCreator() {
var args = arguments;
var className = UNKNOWN_NAME;
var ix = 0;
- if (typeof args[0] === "string") {
+ if (typeof args[0] === 'string') {
className = args[0];
ix = 1;
}
@@ -145,7 +145,7 @@ var cloo = (function() {
}
}
- var lastIx = selfs.length-1;
+ var lastIx = selfs.length - 1;
if (lastIx >= 0 && !selfs[lastIx]) {
selfs[lastIx] = out;
}
@@ -155,14 +155,14 @@ var cloo = (function() {
function selfStorage() {
var ix = selfs.length;
- if (ix && !selfs[ix-1]) {
- throw "me() must be followed by obj()";
+ if (ix && !selfs[ix - 1]) {
+ throw 'me() must be followed by obj()';
}
selfs.push(null);
return function() {
var obj = selfs[ix];
if (!obj) {
- throw "me() access before obj creation";
+ throw 'me() access before obj creation';
}
return obj;
};
Modified:
shindig/trunk/features/src/main/javascript/features/container/constant.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/constant.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/constant.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/constant.js
Wed Jun 8 01:12:46 2011
@@ -31,143 +31,111 @@ osapi.container = {};
/**
* Constants to key into gadget metadata state.
+ * @const
* @enum {string}
*/
-osapi.container.MetadataParam = {};
-osapi.container.MetadataParam.LOCAL_EXPIRE_TIME = 'localExpireTimeMs';
-osapi.container.MetadataParam.URL = 'url';
+osapi.container.MetadataParam = {
+ LOCAL_EXPIRE_TIME: 'localExpireTimeMs',
+ URL: 'url'
+};
/**
* Constants to key into gadget metadata response JSON.
* @enum {string}
*/
-osapi.container.MetadataResponse = {};
-osapi.container.MetadataResponse.IFRAME_URL = 'iframeUrl';
-osapi.container.MetadataResponse.NEEDS_TOKEN_REFRESH = 'needsTokenRefresh';
-osapi.container.MetadataResponse.VIEWS = 'views';
-osapi.container.MetadataResponse.EXPIRE_TIME_MS = 'expireTimeMs';
-osapi.container.MetadataResponse.FEATURES = 'features';
-osapi.container.MetadataResponse.HEIGHT = 'height';
-osapi.container.MetadataResponse.MODULE_PREFS = 'modulePrefs';
-osapi.container.MetadataResponse.PREFERRED_HEIGHT = 'preferredHeight';
-osapi.container.MetadataResponse.PREFERRED_WIDTH = 'preferredWidth';
-osapi.container.MetadataResponse.RESPONSE_TIME_MS = 'responseTimeMs';
-osapi.container.MetadataResponse.WIDTH = 'width';
+
+osapi.container.MetadataResponse = {
+ IFRAME_URL: 'iframeUrl',
+ NEEDS_TOKEN_REFRESH: 'needsTokenRefresh',
+ VIEWS: 'views',
+ EXPIRE_TIME_MS: 'expireTimeMs',
+ FEATURES: 'features',
+ HEIGHT: 'height',
+ MODULE_PREFS: 'modulePrefs',
+ PREFERRED_HEIGHT: 'preferredHeight',
+ PREFERRED_WIDTH: 'preferredWidth',
+ RESPONSE_TIME_MS: 'responseTimeMs',
+ WIDTH: 'width'
+};
/**
* Constants to key into gadget token response JSON.
* @enum {string}
*/
-osapi.container.TokenResponse = {};
-osapi.container.TokenResponse.TOKEN = 'token';
+osapi.container.TokenResponse = {
+ TOKEN: 'token'
+};
/**
* Constants to key into timing response JSON.
- * @type {string}
+ * @enum {string}
*/
-osapi.container.NavigateTiming = {};
-// The gadget URL reporting this timing information.
-osapi.container.NavigateTiming.URL = 'url';
-// The gadget site ID reporting this timing information.
-osapi.container.NavigateTiming.ID = 'id';
-// Absolute time (ms) when gadget navigation is requested.
-osapi.container.NavigateTiming.START = 'start';
-// Time (ms) to receive XHR response time. In CC, for metadata and token.
-osapi.container.NavigateTiming.XRT = 'xrt';
-// Time (ms) to receive first byte. Typically timed at start of page.
-osapi.container.NavigateTiming.SRT = 'srt';
-// Time (ms) to load the DOM. Typically timed at end of page.
-osapi.container.NavigateTiming.DL = 'dl';
-// Time (ms) when body onload is called.
-osapi.container.NavigateTiming.OL = 'ol';
-// Time (ms) when page is ready for use. Typically happen after data XHR (ex:
-// calendar, email) is received/presented to users. Overridable by user.
-osapi.container.NavigateTiming.PRT = 'prt';
+osapi.container.NavigateTiming = {
+ /** The gadget URL reporting this timing information. */
+ URL: 'url',
+ /** The gadget site ID reporting this timing information. */
+ ID: 'id',
+ /** Absolute time (ms) when gadget navigation is requested. */
+ START: 'start',
+ /** Time (ms) to receive XHR response time. In CC, for metadata and token. */
+ XRT: 'xrt',
+ /** Time (ms) to receive first byte. Typically timed at start of page. */
+ SRT: 'srt',
+ /** Time (ms) to load the DOM. Typically timed at end of page. */
+ DL: 'dl',
+ /** Time (ms) when body onload is called. */
+ OL: 'ol',
+ /** Time (ms) when page is ready for use. Typically happen after data XHR
(ex:
+ * calendar, email) is received/presented to users. Overridable by user.
+ */
+ PRT: 'prt'
+};
/**
* Constants to key into request renderParam JSON.
* @enum {string}
- */
-osapi.container.RenderParam = {};
-
-/**
- * Allow gadgets to render in unspecified view.
- * @type {string}
* @const
*/
-osapi.container.RenderParam.ALLOW_DEFAULT_VIEW = 'allowDefaultView';
+osapi.container.RenderParam = {
+ /** Allow gadgets to render in unspecified view. */
+ ALLOW_DEFAULT_VIEW: 'allowDefaultView',
-/**
- * Whether to enable cajole mode.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.CAJOLE = 'cajole';
+ /** Whether to enable cajole mode. */
+ CAJOLE: 'cajole',
-/**
- * Style class to associate to iframe.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.CLASS = 'class';
-
-/**
- * Whether to enable debugging mode.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.DEBUG = 'debug';
+ /** Style class to associate to iframe. */
+ CLASS: 'class',
-/**
- * The starting gadget iframe height (in pixels).
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.HEIGHT = 'height';
+ /** Whether to enable debugging mode. */
+ DEBUG: 'debug',
-/**
- * Whether to disable cache.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.NO_CACHE = 'nocache';
+ /** The starting gadget iframe height (in pixels). */
+ HEIGHT: 'height',
-/**
- * Whether to enable test mode.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.TEST_MODE = 'testmode';
+ /** Whether to disable cache. */
+ NO_CACHE: 'nocache',
-/**
- * The gadget user prefs to render with.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.USER_PREFS = 'userPrefs';
+ /** Whether to enable test mode. */
+ TEST_MODE: 'testmode',
-/**
- * The view of gadget to render.
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.VIEW = 'view';
+ /** The gadget user prefs to render with. */
+ USER_PREFS: 'userPrefs',
-/**
- * The starting gadget iframe width (in pixels).
- * @type {string}
- * @const
- */
-osapi.container.RenderParam.WIDTH = 'width';
+ /** The view of gadget to render. */
+ VIEW: 'view',
+ /** The starting gadget iframe width (in pixels). */
+ WIDTH: 'width'
+};
/**
* Constants to key into request viewParam JSON.
* @enum {string}
*/
-osapi.container.ViewParam = {};
-osapi.container.ViewParam.VIEW = 'view';
+osapi.container.ViewParam = {
+ VIEW: 'view'
+};
Modified:
shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/container/gadget_holder.js
Wed Jun 8 01:12:46 2011
@@ -83,7 +83,10 @@ osapi.container.GadgetHolder = function(
};
/**
- * Url points to the rpc_relay.html which allows cross-domain communication
between a gadget and container
+ * Url points to the rpc_relay.html which allows cross-domain communication
between
+ * a gadget and container
+ * @type {string}
+ * @private
*/
osapi.container.GadgetHolder.prototype.relayPath_ = null;
@@ -152,7 +155,7 @@ osapi.container.GadgetHolder.prototype.g
/**
* @param {string} value The value to set this social/security token to.
- * @return {osapi.container.GadgetHolder}
+ * @return {osapi.container.GadgetHolder} the current GadgetHolder
*/
osapi.container.GadgetHolder.prototype.setSecurityToken = function(value) {
this.securityToken_ = value;
@@ -168,8 +171,8 @@ osapi.container.GadgetHolder.prototype.s
*/
osapi.container.GadgetHolder.prototype.render = function(
gadgetInfo, viewParams, renderParams) {
- this.iframeId_ = osapi.container.GadgetHolder.IFRAME_ID_PREFIX_
- + this.siteId_;
+ this.iframeId_ = osapi.container.GadgetHolder.IFRAME_ID_PREFIX_ +
+ this.siteId_;
this.gadgetInfo_ = gadgetInfo;
this.viewParams_ = viewParams;
this.renderParams_ = renderParams;
@@ -239,7 +242,8 @@ osapi.container.GadgetHolder.prototype.d
{
Container: {
onSecurityAlert: function(source, alertType) {
- gadgets.error(['Security error for container ',
source.getClientID(), ' : ', alertType].join(''));
+ gadgets.error(['Security error for container ',
+ source.getClientID(), ' : ', alertType].join(''));
source.getIframe().src = 'about:blank';
},
onConnect: function(container) {
@@ -249,7 +253,8 @@ osapi.container.GadgetHolder.prototype.d
IframeContainer: {
parent: this.el_,
uri: this.getIframeUrl_(),
- //tunnelURI: shindig.uri('/test1/gadgets/' +
'../container/rpc_relay.html').resolve(shindig.uri(window.location.href)),
+ //tunnelURI: shindig.uri('/test1/gadgets/' +
'../container/rpc_relay.html')
+ // .resolve(shindig.uri(window.location.href)),
tunnelURI:
shindig.uri(this.relayPath_).resolve(shindig.uri(window.location.href)),
iframeAttrs: iframeParams
}
@@ -262,6 +267,7 @@ osapi.container.GadgetHolder.prototype.d
* @param {Object} gadgetInfo the JSON gadget description.
* @param {string} feature the feature to look for.
* @private
+ * @return {boolean} true if feature is set.
*/
osapi.container.GadgetHolder.prototype.hasFeature_ = function(gadgetInfo,
feature) {
var modulePrefs = gadgetInfo[osapi.container.MetadataResponse.MODULE_PREFS];
@@ -331,7 +337,7 @@ osapi.container.GadgetHolder.prototype.g
if (this.renderParams_[osapi.container.RenderParam.CAJOLE]) {
var libs = uri.getQP('libs');
if (libs == null || libs == '') uri.setQP('libs', 'caja');
- else uri.setQP('libs', [ libs, ':caja' ].join(''));
+ else uri.setQP('libs', [libs, ':caja'].join(''));
uri.setQP('caja', '1');
}
this.updateUserPrefParams_(uri);
@@ -364,7 +370,6 @@ osapi.container.GadgetHolder.prototype.g
* and its appearance (in query params or fragment).
* @param {shindig.uri} uri The URL possibly containing user preferences
* parameters prefixed by up_.
- * @return {string} The URL with up_ replaced by those specified in userPrefs.
* @private
*/
osapi.container.GadgetHolder.prototype.updateUserPrefParams_ = function(uri) {
@@ -382,14 +387,13 @@ osapi.container.GadgetHolder.prototype.u
};
function init(config) {
- if (config.container){
- var rpath = config["container"]["relayPath"];
- osapi.container.GadgetHolder.prototype.relayPath_ = rpath;
- }
-};
+ if (config.container) {
+ var rpath = config['container']['relayPath'];
+ osapi.container.GadgetHolder.prototype.relayPath_ = rpath;
+ }
+}
// We do run this in the container mode in the new common container
if (gadgets.config) {
- gadgets.config.register("container", null, init);
-
-};
+ gadgets.config.register('container', null, init);
+}
Modified:
shindig/trunk/features/src/main/javascript/features/container/gadget_site.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/gadget_site.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/container/gadget_site.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/container/gadget_site.js
Wed Jun 8 01:12:46 2011
@@ -247,11 +247,11 @@ osapi.container.GadgetSite.prototype.ren
if (curUrl == gadgetInfo['url']) {
previousView = this.currentGadgetHolder_.getView();
}
-
+
// Find requested view.
- var view = renderParams[osapi.container.RenderParam.VIEW]
- || viewParams[osapi.container.ViewParam.VIEW]
- || previousView;
+ var view = renderParams[osapi.container.RenderParam.VIEW] ||
+ viewParams[osapi.container.ViewParam.VIEW] ||
+ previousView;
var viewInfo = gadgetInfo[osapi.container.MetadataResponse.VIEWS][view];
// Allow default view if requested view is not found.
@@ -276,16 +276,16 @@ osapi.container.GadgetSite.prototype.ren
}
localRenderParams[osapi.container.RenderParam.VIEW] = view;
- localRenderParams[osapi.container.RenderParam.HEIGHT]
- = renderParams[osapi.container.RenderParam.HEIGHT]
- || viewInfo[osapi.container.MetadataResponse.PREFERRED_HEIGHT]
- ||
gadgetInfo[osapi.container.MetadataResponse.MODULE_PREFS][osapi.container.MetadataResponse.HEIGHT]
- || String(osapi.container.GadgetSite.DEFAULT_HEIGHT_);
- localRenderParams[osapi.container.RenderParam.WIDTH]
- = renderParams[osapi.container.RenderParam.WIDTH]
- || viewInfo[osapi.container.MetadataResponse.PREFERRED_WIDTH]
- ||
gadgetInfo[osapi.container.MetadataResponse.MODULE_PREFS][osapi.container.MetadataResponse.WIDTH]
- || String(osapi.container.GadgetSite.DEFAULT_WIDTH_);
+ localRenderParams[osapi.container.RenderParam.HEIGHT] =
+ renderParams[osapi.container.RenderParam.HEIGHT] ||
+ viewInfo[osapi.container.MetadataResponse.PREFERRED_HEIGHT] ||
+
gadgetInfo[osapi.container.MetadataResponse.MODULE_PREFS][osapi.container.MetadataResponse.HEIGHT]
||
+ String(osapi.container.GadgetSite.DEFAULT_HEIGHT_);
+ localRenderParams[osapi.container.RenderParam.WIDTH] =
+ renderParams[osapi.container.RenderParam.WIDTH] ||
+ viewInfo[osapi.container.MetadataResponse.PREFERRED_WIDTH] ||
+
gadgetInfo[osapi.container.MetadataResponse.MODULE_PREFS][osapi.container.MetadataResponse.WIDTH]
||
+ String(osapi.container.GadgetSite.DEFAULT_WIDTH_);
this.updateSecurityToken_(gadgetInfo, localRenderParams);
@@ -334,9 +334,10 @@ osapi.container.GadgetSite.prototype.rpc
* one. Otherwise, leave it.
* @param {Object} gadgetInfo The gadgetInfo used to update security token.
* @param {Object} renderParams Look at osapi.container.RenderParam.
+ * @private
*/
-osapi.container.GadgetSite.prototype.updateSecurityToken_
- = function(gadgetInfo, renderParams) {
+osapi.container.GadgetSite.prototype.updateSecurityToken_ =
+ function(gadgetInfo, renderParams) {
var tokenInfo = this.service_.getCachedGadgetToken(gadgetInfo['url']);
if (tokenInfo) {
var token = tokenInfo[osapi.container.TokenResponse.TOKEN];
Modified: shindig/trunk/features/src/main/javascript/features/container/init.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/init.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/init.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/init.js Wed
Jun 8 01:12:46 2011
@@ -59,9 +59,8 @@
window.__API_URI.resolve(window.__CONTAINER_URI);
}
- window.__CONTAINER = window.__API_URI
- ? window.__API_URI.getQP('container')
- : 'default';
+ window.__CONTAINER = window.__API_URI ?
+ window.__API_URI.getQP('container') : 'default';
}
initializeConfig();
Modified:
shindig/trunk/features/src/main/javascript/features/container/service.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/service.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/service.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/service.js
Wed Jun 8 01:12:46 2011
@@ -127,8 +127,8 @@ osapi.container.Service.prototype.getGad
/**
* Add preloaded gadgets to cache
- * @param {Object} response hash of gadgets metadata
- * @param {Object} data time to override responseTime (in order to support
external caching)
+ * @param {Object} response hash of gadgets metadata.
+ * @param {Object} refTime time to override responseTime (in order to support
external caching).
*/
osapi.container.Service.prototype.addGadgetMetadatas = function(response,
refTime) {
this.addToCache_(response, refTime, this.cachedMetadatas_);
@@ -137,8 +137,9 @@ osapi.container.Service.prototype.addGad
/**
* Add preloaded tokens to cache
- * @param {Object} response hash of gadgets metadata
- * @param {Object} refTime data time to override responseTime (in order to
support external caching)
+ * @param {Object} response hash of gadgets metadata.
+ * @param {Object} refTime data time to override responseTime
+ * (in order to support external caching).
*/
osapi.container.Service.prototype.addGadgetTokens = function(response,
refTime) {
this.addToCache_(response, refTime, this.cachedTokens_);
@@ -147,9 +148,9 @@ osapi.container.Service.prototype.addGad
/**
* Utility function to add data to cache
- * @param {Object} response hash of gadgets metadata
- * @param {Object} refTime data time to override responseTime (in order to
support external caching)
- * @param {Object} cache the cache to update
+ * @param {Object} response hash of gadgets metadata.
+ * @param {Object} refTime data time to override responseTime (in order to
support external caching).
+ * @param {Object} cache the cache to update.
* @private
*/
osapi.container.Service.prototype.addToCache_ = function(response, refTime,
cache) {
@@ -164,21 +165,21 @@ osapi.container.Service.prototype.addToC
/**
* Update gadget data, set gadget id and calculate expiration time
- * @param {Object} resp gadget metadata item
- * @param {string} id gadget id
- * @param {Object} opt_refTime data time to override responseTime (support
external caching)
- * @param {Object} currentTimeMs current time
+ * @param {Object} resp gadget metadata item.
+ * @param {string} id gadget id.
+ * @param {Object} currentTimeMs current time.
+ * @param {Object} opt_refTime data time to override responseTime (support
external caching).
* @private
*/
osapi.container.Service.prototype.updateResponse_ = function(
- resp, id, currentTimeMs, opt_refTime) {
+ resp, id, currentTimeMs, opt_refTime) {
resp[osapi.container.MetadataParam.URL] = id;
// This ignores time to fetch metadata. Okay, expect to be < 2s.
- resp[osapi.container.MetadataParam.LOCAL_EXPIRE_TIME]
- = resp[osapi.container.MetadataResponse.EXPIRE_TIME_MS]
- - (opt_refTime == null ?
- resp[osapi.container.MetadataResponse.RESPONSE_TIME_MS] :
opt_refTime)
- + currentTimeMs;
+ resp[osapi.container.MetadataParam.LOCAL_EXPIRE_TIME] =
+ resp[osapi.container.MetadataResponse.EXPIRE_TIME_MS] -
+ (opt_refTime == null ?
+ resp[osapi.container.MetadataResponse.RESPONSE_TIME_MS] :
opt_refTime) +
+ currentTimeMs;
};
@@ -236,12 +237,13 @@ osapi.container.Service.prototype.getCac
/**
* @param {Object} urls JSON containing gadget URLs to avoid removing.
*/
-osapi.container.Service.prototype.uncacheStaleGadgetMetadataExcept =
function(urls) {
+osapi.container.Service.prototype.uncacheStaleGadgetMetadataExcept =
+ function(urls) {
for (var url in this.cachedMetadatas_) {
if (typeof urls[url] === 'undefined') {
var gadgetInfo = this.cachedMetadatas_[url];
- if (gadgetInfo[osapi.container.MetadataParam.LOCAL_EXPIRE_TIME]
- < osapi.container.util.getCurrentTimeMs()) {
+ if (gadgetInfo[osapi.container.MetadataParam.LOCAL_EXPIRE_TIME] <
+ osapi.container.util.getCurrentTimeMs()) {
delete this.cachedMetadatas_[url];
}
}
@@ -298,8 +300,8 @@ osapi.container.Service.prototype.getUnc
/**
- * Helper to filter out cached data
- * @param {Object} cache JSON containing cached data.
+ * Helper to filter out cached data
+ * @param {Object} data JSON containing cached data.
* @param {Object} request containing ids.
* @param {Function} filterFunc function to filter result.
* @return {Object} JSON containing requested and filtered entries.
Modified: shindig/trunk/features/src/main/javascript/features/container/util.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container/util.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container/util.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/container/util.js Wed
Jun 8 01:12:46 2011
@@ -29,15 +29,14 @@ osapi.container.util = {};
/**
- * Return value of json at key, if valid. Otherwise, return defaultValue.
* @param {Object} json The JSON to look up key param from.
* @param {string} key Key in config.
* @param {*=} defaultValue The default value to return.
- * @return {*}
+ * @return {*} value of json at key, if valid. Otherwise, return defaultValue.
*/
osapi.container.util.getSafeJsonValue = function(json, key, defaultValue) {
- return (json[key] != undefined && json[key] != null)
- ? json[key] : defaultValue;
+ return (json[key] != undefined && json[key] != null) ?
+ json[key] : defaultValue;
};
@@ -86,7 +85,7 @@ osapi.container.util.newMetadataRequest
/**
* Construct a JSON request to get gadget token.
- * @param {Array} A list of gadget URLs.
+ * @param {Array} gadgetUrls A list of gadget URLs.
* @return {Object} the resulting JSON.
*/
osapi.container.util.newTokenRequest = function(gadgetUrls) {
@@ -115,9 +114,8 @@ osapi.container.util.toArrayOfJsonKeys =
/**
- * Return true if json is empty.
* @param {Object} json to check.
- * @return {Boolean}
+ * @return {Boolean} true if json is empty.
*/
osapi.container.util.isEmptyJson = function(json) {
for (var key in json) {
Modified:
shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.config.base/config.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/core.config.base/config.js
Wed Jun 8 01:12:46 2011
@@ -66,8 +66,8 @@ gadgets.config = function() {
if (!updConfig.hasOwnProperty(key)) {
continue;
}
- if (typeof origConfig[key] === "object" &&
- typeof updConfig[key] === "object") {
+ if (typeof origConfig[key] === 'object' &&
+ typeof updConfig[key] === 'object') {
// Both have the same key with an object value. Recurse.
foldConfig(origConfig[key], updConfig[key]);
} else {
@@ -81,7 +81,7 @@ gadgets.config = function() {
function getLoadingScript() {
// Attempt to retrieve config augmentation from latest script node.
- var scripts = document.scripts || document.getElementsByTagName("script");
+ var scripts = document.scripts || document.getElementsByTagName('script');
if (!scripts || scripts.length == 0) return null;
var scriptTag;
if (___jsl['u']) {
@@ -102,7 +102,7 @@ gadgets.config = function() {
}
function getInnerText(scriptNode) {
- var scriptText = "";
+ var scriptText = '';
if (scriptNode.nodeType == 3 || scriptNode.nodeType == 4) {
scriptText = scriptNode.nodeValue;
} else if (scriptNode.innerText) {
@@ -122,15 +122,15 @@ gadgets.config = function() {
function parseConfig(configText) {
var config;
try {
- config = (new Function("return (" + configText + "\n)"))();
+ config = (new Function('return (' + configText + '\n)'))();
} catch (e) { }
- if (typeof config === "object") {
+ if (typeof config === 'object') {
return config;
}
try {
- config = (new Function("return ({" + configText + "\n})"))();
+ config = (new Function('return ({' + configText + '\n})'))();
} catch (e) { }
- return typeof config === "object" ? config : {};
+ return typeof config === 'object' ? config : {};
}
function augmentConfig(baseConfig) {
@@ -225,10 +225,10 @@ gadgets.config = function() {
* @function
*/
init: function(config, opt_noValidation) {
- ___jsl = window["___jsl"] || {};
+ ___jsl = window['___jsl'] || {};
foldConfig(configuration, config);
augmentConfig(configuration);
- var inlineOverride = window["___config"] || {};
+ var inlineOverride = window['___config'] || {};
foldConfig(configuration, inlineOverride);
for (var name in components) {
if (components.hasOwnProperty(name)) {
@@ -260,13 +260,13 @@ gadgets.config = function() {
/**
* Method largely for dev and debugging purposes that
* replaces or manually updates feature config.
- * @param updateConfig {Object} Config object, with keys for features.
- * @param opt_replace {Boolean} true to replace all configuration.
+ * @param {Object} updateConfig Config object, with keys for features.
+ * @param {boolean} opt_replace true to replace all configuration.
*/
update: function(updateConfig, opt_replace) {
configuration = opt_replace ? {} : configuration || {};
foldConfig(configuration, updateConfig);
}
- }
+ };
}();
} // ! end double inclusion guard
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=1133229&r1=1133228&r2=1133229&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 Wed Jun
8 01:12:46 2011
@@ -258,7 +258,7 @@ gadgets.io = function() {
if (paramData !== null) {
var contentTypeHeader = 'Content-Type';
var contentType = 'application/x-www-form-urlencoded';
- if (typeof opt_headers === "string") {
+ if (typeof opt_headers === 'string') {
// This turned out to come directly from a public API, so we need to
// keep compatibility...
contentType = opt_headers;
@@ -446,8 +446,8 @@ gadgets.io = function() {
},
/**
- * @param {string} relativeUrl url to fetch via xhr
- * @param callback callback to call when response is received or for error
+ * @param {string} relativeUrl url to fetch via xhr.
+ * @param callback callback to call when response is received or for error.
* @param {Object=} opt_params
* @param {Object=} opt_headers
*
@@ -536,6 +536,9 @@ gadgets.io = function() {
};
}();
+/**
+ * @const
+ **/
gadgets.io.RequestParameters = gadgets.util.makeEnum([
'METHOD',
'CONTENT_TYPE',
Modified:
shindig/trunk/features/src/main/javascript/features/osapi.base/batch.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi.base/batch.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/osapi.base/batch.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/osapi.base/batch.js Wed
Jun 8 01:12:46 2011
@@ -37,7 +37,7 @@
// transport : <rpc dispatcher>
// }
// }
-
+
/** @type {Array.<Object>} */
var keyedRequests = [];
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=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/osapi/jsonrpctransport.js
Wed Jun 8 01:12:46 2011
@@ -23,7 +23,7 @@
(function() {
var useOAuth2;
-
+
/**
* Called by a batch to execute all requests
* @param {Object} requests
Modified:
shindig/trunk/features/src/main/javascript/features/rpc/flash.transport.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/rpc/flash.transport.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/rpc/flash.transport.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/rpc/flash.transport.js
Wed Jun 8 01:12:46 2011
@@ -32,7 +32,7 @@ gadgets.rpctx = gadgets.rpctx || {};
if (!gadgets.rpctx.flash) { // make lib resilient to double-inclusion
gadgets.rpctx.flash = function() {
- var swfId = "___xpcswf";
+ var swfId = '___xpcswf';
var swfUrl = null;
var usingFlash = false;
var processFn = null;
@@ -45,15 +45,15 @@ if (!gadgets.rpctx.flash) { // make lib
var setupHandle = null;
var setupAttempts = 0;
- var SWF_CHANNEL_READY = "_scr";
- var SWF_CONFIRMED_PARENT = "_pnt";
+ var SWF_CHANNEL_READY = '_scr';
+ var SWF_CONFIRMED_PARENT = '_pnt';
var READY_TIMEOUT_MS = 100;
var MAX_READY_RETRIES = 50;
var readyAttempts = 0;
var readyHandle = null;
var readyMsgs = {};
- var myLoc = window.location.protocol + "//" + window.location.host;
+ var myLoc = window.location.protocol + '//' + window.location.host;
var JSL_NS = '___jsl';
var METHODS_NS = '_fm';
var bucketNs;
@@ -62,7 +62,7 @@ if (!gadgets.rpctx.flash) { // make lib
window[JSL_NS] = window[JSL_NS] || {};
var container = window[JSL_NS];
var bucket = container[METHODS_NS] = {};
- bucketNs = JSL_NS + "." + METHODS_NS;
+ bucketNs = JSL_NS + '.' + METHODS_NS;
return bucket;
}
@@ -73,20 +73,20 @@ if (!gadgets.rpctx.flash) { // make lib
method.apply({}, arguments);
};
methodBucket[requestedName] = methodBucket[requestedName] || exported;
- return bucketNs + "." + requestedName;
+ return bucketNs + '.' + requestedName;
}
function getChannelId(receiverId) {
- return receiverId === ".." ? gadgets.rpc.RPC_ID : receiverId;
+ return receiverId === '..' ? gadgets.rpc.RPC_ID : receiverId;
}
function getRoleId(targetId) {
- return targetId === ".." ? "INNER" : "OUTER";
+ return targetId === '..' ? 'INNER' : 'OUTER';
}
function init(config) {
if (usingFlash) {
- swfUrl = config['rpc']['commSwf'] || "/xpc.swf";
+ swfUrl = config['rpc']['commSwf'] || '/xpc.swf';
}
}
gadgets.config.register('rpc', null, init);
@@ -128,8 +128,8 @@ if (!gadgets.rpctx.flash) { // make lib
// to receive messages. This only occurs after the SWF indicates that
// its setup() method has been successfully called and completed, and
// only in child context.
- if (readyMsgs[".."]) return;
- sendChannelReady("..");
+ if (readyMsgs['..']) return;
+ sendChannelReady('..');
readyAttempts++;
if (readyAttempts >= MAX_READY_RETRIES && readyHandle !== null) {
window.clearTimeout(readyHandle);
@@ -164,7 +164,7 @@ if (!gadgets.rpctx.flash) { // make lib
// Called by SWF only for role_id = "INNER" ie when initializing to
parent.
// Instantiates a polling handshake mechanism which ensures that any
enqueued
// messages remain so until each side is ready to send.
- if (!readyMsgs[".."] && readyHandle === null) {
+ if (!readyMsgs['..'] && readyHandle === null) {
readyHandle = window.setTimeout(childReadyPoller, READY_TIMEOUT_MS);
}
}
@@ -173,7 +173,7 @@ if (!gadgets.rpctx.flash) { // make lib
function call(targetId, from, rpc) {
var targetOrigin = gadgets.rpc.getTargetOrigin(targetId);
var rpcKey = gadgets.rpc.getAuthToken(targetId);
- var handleKey = "sendMessage_" + getChannelId(targetId) + "_" + rpcKey +
"_" + getRoleId(targetId);
+ var handleKey = 'sendMessage_' + getChannelId(targetId) + '_' + rpcKey +
'_' + getRoleId(targetId);
var messageHandler = relayHandle[handleKey];
messageHandler.call(relayHandle, gadgets.json.stringify(rpc),
targetOrigin);
return true;
@@ -190,7 +190,7 @@ if (!gadgets.rpctx.flash) { // make lib
// This method is OK to call twice, if it occurs in a race.
readyFn(channelReady, true);
readyMsgs[channelReady] = true;
- if (channelReady !== "..") {
+ if (channelReady !== '..') {
// Child-to-parent: immediately signal that parent is ready.
// Now that we know that child can receive messages, it's enough to
send once.
sendChannelReady(channelReady, true);
@@ -204,7 +204,7 @@ if (!gadgets.rpctx.flash) { // make lib
function sendChannelReady(receiverId, opt_isParentConfirmation) {
var myId = gadgets.rpc.RPC_ID;
var readyAck = {};
- readyAck[SWF_CHANNEL_READY] = opt_isParentConfirmation ? ".." : myId;
+ readyAck[SWF_CHANNEL_READY] = opt_isParentConfirmation ? '..' : myId;
readyAck[SWF_CONFIRMED_PARENT] = myId;
call(receiverId, myId, readyAck);
}
Modified:
shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/rpc/ifpc.transport.js
Wed Jun 8 01:12:46 2011
@@ -161,7 +161,7 @@ if (!gadgets.rpctx.ifpc) { // make lib
src = [relay, '#', targetId, '&', from, '@', callId, '&'].join('');
var message = encodeURIComponent(gadgets.json.stringify(rpc)),
payloadLength = URL_LIMIT - src.length,
- numPackets = Math.ceil(message.length/payloadLength),
+ numPackets = Math.ceil(message.length / payloadLength),
packetIdx = 0,
part;
while (message.length > 0) {
@@ -176,7 +176,7 @@ if (!gadgets.rpctx.ifpc) { // make lib
// the relay URL and appended message.
do {
emitInvisibleIframe(queueOut.shift());
- } while(queueOut.length > 0);
+ } while (queueOut.length > 0);
return true;
},
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=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/rpc/rpc.js (original)
+++ shindig/trunk/features/src/main/javascript/features/rpc/rpc.js Wed Jun 8
01:12:46 2011
@@ -337,7 +337,7 @@ if (!window['gadgets']['rpc']) { // make
// The second clause simply verifies that referrer is valid.
referrer = opt_sender;
}
- rpc[RPC_KEY_REFERRER] = referrer;
+ rpc[RPC_KEY_REFERRER] = referrer;
}
// Call the requested RPC service.
@@ -645,10 +645,10 @@ if (!window['gadgets']['rpc']) { // make
}
function setReferrerConfig(cfg) {
- var passReferrer = cfg['passReferrer'] || "";
- var prParts = passReferrer.split(":", 2);
- passReferrerDirection = prParts[0] || "none";
- passReferrerContents = prParts[1] || "origin";
+ var passReferrer = cfg['passReferrer'] || '';
+ var prParts = passReferrer.split(':', 2);
+ passReferrerDirection = prParts[0] || 'none';
+ passReferrerContents = prParts[1] || 'origin';
}
@@ -658,7 +658,7 @@ if (!window['gadgets']['rpc']) { // make
transport.init(process, transportReady);
}
}
-
+
function isLegacyProtocolConfig(cfg) {
return String(cfg['useLegacyProtocol']) === 'true';
}
@@ -773,14 +773,14 @@ if (!window['gadgets']['rpc']) { // make
}
function getReferrer(targetId) {
- if (passReferrerDirection === "bidir" ||
- (passReferrerDirection === "c2p" && targetId === "..") ||
- (passReferrerDirection === "p2c" && targetId !== "..")) {
+ if (passReferrerDirection === 'bidir' ||
+ (passReferrerDirection === 'c2p' && targetId === '..') ||
+ (passReferrerDirection === 'p2c' && targetId !== '..')) {
var href = window.location.href;
- var lopOff = "?"; // default = origin
- if (passReferrerContents === "query") {
- lopOff = "#";
- } else if (passReferrerContents === "hash") {
+ var lopOff = '?'; // default = origin
+ if (passReferrerContents === 'query') {
+ lopOff = '#';
+ } else if (passReferrerContents === 'hash') {
return href;
}
var lastIx = href.lastIndexOf(lopOff);
@@ -1053,7 +1053,7 @@ if (!window['gadgets']['rpc']) { // make
ACK: ACK,
- RPC_ID: rpcId || "..",
+ RPC_ID: rpcId || '..',
SEC_ERROR_LOAD_TIMEOUT: LOAD_TIMEOUT,
SEC_ERROR_FRAME_PHISH: FRAME_PHISH,
Modified:
shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js?rev=1133229&r1=1133228&r2=1133229&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js
(original)
+++ shindig/trunk/features/src/main/javascript/features/rpc/wpm.transport.js
Wed Jun 8 01:12:46 2011
@@ -76,7 +76,7 @@ if (!gadgets.rpctx.wpm) { // make lib r
// event.origin does not exist, use event.domain. The other difference
is that
// while event.origin looks like <scheme>://<hostname>:<port>,
event.domain
// consists only of <hostname>.
- if (typeof packet.origin !== "undefined" ? packet.origin !== origin :
+ if (typeof packet.origin !== 'undefined' ? packet.origin !== origin :
packet.domain !== /^.+:\/\/([^:]+).*/.exec(origin)[1]) {
return;
}
