Author: lindner
Date: Thu Jan 22 17:29:25 2009
New Revision: 736883
URL: http://svn.apache.org/viewvc?rev=736883&view=rev
Log:
SHINDIG-776 | Adapted patch from Henning Schmiedehausen | jslint issues -
semicolons
Modified:
incubator/shindig/trunk/features/core.io/io.js
incubator/shindig/trunk/features/core.io/iotest.js
incubator/shindig/trunk/features/core/config.js
incubator/shindig/trunk/features/flash/flash.js
incubator/shindig/trunk/features/opensocial-0.6/opensocial6to7.js
incubator/shindig/trunk/features/opensocial-0.7/opensocial7to8.js
incubator/shindig/trunk/features/opensocial-base/fieldtranslations.js
incubator/shindig/trunk/features/opensocial-base/jsonactivity.js
incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js
incubator/shindig/trunk/features/opensocial-base/jsonperson.js
incubator/shindig/trunk/features/opensocial-jsonrpc/jsonrpccontainer.js
incubator/shindig/trunk/features/opensocial-reference/mediaitem.js
incubator/shindig/trunk/features/opensocial-rest/restfulcontainer.js
incubator/shindig/trunk/features/opensocial-templates/base.js
incubator/shindig/trunk/features/opensocial-templates/container.js
incubator/shindig/trunk/features/opensocial-templates/data.js
incubator/shindig/trunk/features/opensocial-templates/loader.js
incubator/shindig/trunk/features/opensocial-templates/namespaces.js
incubator/shindig/trunk/features/opensocial-templates/os.js
incubator/shindig/trunk/features/opensocial-templates/template_test.js
incubator/shindig/trunk/features/rpc/rpc.js
incubator/shindig/trunk/features/skins/skins.js
incubator/shindig/trunk/features/tabs/tabs.js
incubator/shindig/trunk/javascript/container/gadgets.js
incubator/shindig/trunk/javascript/container/sample-pubsub.html
incubator/shindig/trunk/javascript/container/sample1.html
incubator/shindig/trunk/javascript/container/sample2.html
incubator/shindig/trunk/javascript/container/sample3.html
incubator/shindig/trunk/javascript/container/sample4.html
incubator/shindig/trunk/javascript/container/sample5.html
incubator/shindig/trunk/javascript/container/sample6.html
incubator/shindig/trunk/javascript/container/sample7.html
incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
incubator/shindig/trunk/site/index.html
Modified: incubator/shindig/trunk/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/core.io/io.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/core.io/io.js (original)
+++ incubator/shindig/trunk/features/core.io/io.js Thu Jan 22 17:29:25 2009
@@ -241,7 +241,7 @@
oauthError: preload.oauthError,
oauthErrorText: preload.oauthErrorText,
errors: []
- }
+ };
callback(transformResponseData(params, resp));
}
return true;
@@ -440,7 +440,7 @@
if (refresh === undefined) {
refresh = "3600";
}
-
+
var urlParams = gadgets.util.getUrlParameters();
return config.proxyUrl.replace("%url%", encodeURIComponent(url)).
Modified: incubator/shindig/trunk/features/core.io/iotest.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/core.io/iotest.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/core.io/iotest.js (original)
+++ incubator/shindig/trunk/features/core.io/iotest.js Thu Jan 22 17:29:25 2009
@@ -38,7 +38,7 @@
gadgets.config.init({ "core.io" : {
"proxyUrl" :
"http://example.com/proxy?url=%url%&refresh=%refresh%&g=%gadget%&c=%container%";,
- "jsonProxyUrl" : "http://example.com/json"; }});
+ "jsonProxyUrl" : "http://example.com/json"; }});
gadgets.io.preloaded_ = {};
};
@@ -90,7 +90,7 @@
} else {
req.setQueryArg(name, value);
}
-}
+};
IoTest.prototype.setStandardArgs = function(req, inBody) {
this.setArg(req, inBody, "refresh", "3600");
@@ -509,9 +509,9 @@
req.setHeader("Content-Type", "application/x-www-form-urlencoded");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'oauthApprovalUrl' : 'http://sp.example.com/authz?oauth_token=foo',
- 'oauthState' : 'newState'
+ 'oauthState' : 'newState'
}
}));
@@ -568,9 +568,9 @@
req.setHeader("Content-Type", "application/x-www-form-urlencoded");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'oauthApprovalUrl' : 'http://sp.example.com/authz?oauth_token=foo',
- 'oauthState' : 'newState'
+ 'oauthState' : 'newState'
}
}));
@@ -602,10 +602,10 @@
req.setHeader("Content-Type", "application/x-www-form-urlencoded");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'oauthError' : 'SOME_ERROR_CODE',
'oauthErrorText' : 'Some helpful error message',
- 'oauthState' : 'newState'
+ 'oauthState' : 'newState'
}
}));
@@ -639,9 +639,9 @@
req.setHeader("Content-Type", "application/x-www-form-urlencoded");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'oauthApprovalUrl' : 'http://sp.example.com/authz?oauth_token=foo',
- 'oauthState' : 'newState'
+ 'oauthState' : 'newState'
}
}));
@@ -731,7 +731,7 @@
req.setQueryArg("contentType", "JSON");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'body' : '{ "somejsonparam" : 3 }',
}
}));
@@ -756,7 +756,7 @@
req.setQueryArg("contentType", "JSON");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'body' : '{ bogus : 3 }',
}
}));
@@ -802,7 +802,7 @@
req.setQueryArg("url", "http://target.example.com/somepage";);
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'body' : 'not preloaded',
}
}));
@@ -892,7 +892,7 @@
req.setQueryArg("url", "http://target.example.com/somepage";);
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'body' : 'not preloaded',
}
}));
@@ -934,7 +934,7 @@
req.setHeader("Content-Type", "application/x-www-form-urlencoded");
var resp = this.makeFakeResponse(gadgets.json.stringify(
- { 'http://target.example.com/somepage' : {
+ { 'http://target.example.com/somepage' : {
'body' : 'not preloaded',
}
}
Modified: incubator/shindig/trunk/features/core/config.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/core/config.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/core/config.js (original)
+++ incubator/shindig/trunk/features/core/config.js Thu Jan 22 17:29:25 2009
@@ -159,7 +159,7 @@
return true;
}
}
- }
+ };
},
/**
@@ -168,7 +168,7 @@
RegExValidator: function(re) {
return function(data) {
return re.test(data);
- }
+ };
},
/**
@@ -182,7 +182,7 @@
* Validates that a value is a non-empty string.
*/
NonEmptyStringValidator: function(data) {
- return typeof data === "string" && data.length > 0
+ return typeof data === "string" && data.length > 0;
},
/**
Modified: incubator/shindig/trunk/features/flash/flash.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/flash/flash.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/flash/flash.js (original)
+++ incubator/shindig/trunk/features/flash/flash.js Thu Jan 22 17:29:25 2009
@@ -58,7 +58,7 @@
}
}
return flashMajorVersion;
-}
+};
gadgets.flash.swfContainerId_ = 0;
Modified: incubator/shindig/trunk/features/opensocial-0.6/opensocial6to7.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-0.6/opensocial6to7.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-0.6/opensocial6to7.js (original)
+++ incubator/shindig/trunk/features/opensocial-0.6/opensocial6to7.js Thu Jan
22 17:29:25 2009
@@ -66,14 +66,14 @@
} else {
return this.getField_v07(fieldname);
}
-}
+};
opensocial.Person.prototype.getDisplayName_v07
= opensocial.Person.getDisplayName;
opensocial.Person.prototype.getDisplayName = function() {
return this.getField_v07(opensocial.Person.Field.NAME)
.getField(opensocial.Name.Field.UNSTRUCTURED);
-}
+};
opensocial.newActivity_v07 = opensocial.newActivity;
opensocial.newActivity = function(title, opt_params) {
@@ -114,7 +114,7 @@
// same.
gadgets.views.View.prototype.isPrimaryContent = function() {
return this.isOnlyVisibleGadget();
-}
+};
// Note: The names of views may have changed in a container between 0.6 and 0.7
// but that is container specific
Modified: incubator/shindig/trunk/features/opensocial-0.7/opensocial7to8.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-0.7/opensocial7to8.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-0.7/opensocial7to8.js (original)
+++ incubator/shindig/trunk/features/opensocial-0.7/opensocial7to8.js Thu Jan
22 17:29:25 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-opensocial.Activity.MediaItem = opensocial.MediaItem
+opensocial.Activity.MediaItem = opensocial.MediaItem;
opensocial.newActivityMediaItem = opensocial.newMediaItem;
opensocial.DataRequest.PersonId = opensocial.IdSpec.PersonId;
@@ -32,7 +32,7 @@
opensocial.DataRequest.prototype.newFetchPeopleRequest = function(idSpec,
opt_params) {
return this.newFetchPeopleRequest_v08(translateIdSpec(idSpec), opt_params);
-}
+};
opensocial.DataRequest.prototype.newFetchPersonAppDataRequest_v08
= opensocial.DataRequest.prototype.newFetchPersonAppDataRequest;
@@ -40,7 +40,7 @@
keys, opt_params) {
return this.newFetchPersonAppDataRequest_v08(translateIdSpec(idSpec), keys,
opt_params);
-}
+};
opensocial.DataRequest.prototype.newFetchActivitiesRequest_v08
= opensocial.DataRequest.prototype.newFetchActivitiesRequest;
@@ -50,7 +50,7 @@
= this.newFetchActivitiesRequest_v08(translateIdSpec(idSpec),
opt_params);
request.isActivityRequest = true;
return request;
-}
+};
// TODO: handle making the last param valid json from any given string
// (is it already valid??)
Modified: incubator/shindig/trunk/features/opensocial-base/fieldtranslations.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-base/fieldtranslations.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-base/fieldtranslations.js
(original)
+++ incubator/shindig/trunk/features/opensocial-base/fieldtranslations.js Thu
Jan 22 17:29:25 2009
@@ -89,19 +89,19 @@
serverJson.name.unstructured = serverJson.name.formatted;
}
-}
+};
FieldTranslations.translateEnumJson = function(enumJson) {
if (enumJson) {
enumJson.key = enumJson.value;
}
-}
+};
FieldTranslations.translateUrlJson = function(urlJson) {
if (urlJson) {
urlJson.address = urlJson.value;
}
-}
+};
FieldTranslations.translateJsPersonFieldsToServerFields = function(fields) {
@@ -116,5 +116,5 @@
// displayName and id always need to be requested
fields.push("id");
fields.push("displayName");
-}
+};
Modified: incubator/shindig/trunk/features/opensocial-base/jsonactivity.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-base/jsonactivity.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-base/jsonactivity.js (original)
+++ incubator/shindig/trunk/features/opensocial-base/jsonactivity.js Thu Jan 22
17:29:25 2009
@@ -43,19 +43,19 @@
jsonObject['mediaItems'] = newMediaItems;
return jsonObject;
-}
+};
// TODO: Split into separate class
var JsonMediaItem = function(opt_params) {
opensocial.MediaItem.call(this, opt_params['mimeType'],
opt_params['url'], opt_params);
-}
+};
JsonMediaItem.inherits(opensocial.MediaItem);
JsonMediaItem.prototype.toJsonObject = function() {
return JsonActivity.copyFields(this.fields_);
-}
+};
// TODO: Pull this method into a common class, it is from jsonperson.js
@@ -66,7 +66,7 @@
fieldValue[i] = new className(fieldValue[i]);
}
}
-}
+};
// TODO: Pull into common class as well
JsonActivity.copyFields = function(oldObject) {
@@ -75,4 +75,4 @@
newObject[field] = oldObject[field];
}
return newObject;
-}
+};
Modified: incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js
(original)
+++ incubator/shindig/trunk/features/opensocial-base/jsonactivitytest.js Thu
Jan 22 17:29:25 2009
@@ -41,7 +41,7 @@
var map = {'fakeClass' : [{'field1' : 'value1'}, {'field2' : 'value2'}]};
FakeClass = function(opt_params) {
this.fields = opt_params;
- }
+ };
JsonActivity.constructArrayObject(map, 'fakeClass', FakeClass);
Modified: incubator/shindig/trunk/features/opensocial-base/jsonperson.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-base/jsonperson.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-base/jsonperson.js (original)
+++ incubator/shindig/trunk/features/opensocial-base/jsonperson.js Thu Jan 22
17:29:25 2009
@@ -58,7 +58,7 @@
if (fieldValue) {
map[fieldName] = new opensocial.Enum(fieldValue.key,
fieldValue.displayValue);
}
-}
+};
// Converts the fieldName into an array of instances of an opensocial.Enum
JsonPerson.constructEnumArray = function(map, fieldName) {
@@ -68,7 +68,7 @@
fieldValue[i] = new opensocial.Enum(fieldValue[i].key,
fieldValue[i].displayValue);
}
}
-}
+};
// Converts the fieldName into an instance of the specified object
JsonPerson.constructObject = function(map, fieldName, className) {
@@ -76,7 +76,7 @@
if (fieldValue) {
map[fieldName] = new className(fieldValue);
}
-}
+};
JsonPerson.constructArrayObject = function(map, fieldName, className) {
var fieldValue = map[fieldName];
@@ -85,8 +85,8 @@
fieldValue[i] = new className(fieldValue[i]);
}
}
-}
+};
JsonPerson.prototype.getDisplayName = function() {
return this.getField("displayName");
-}
+};
Modified:
incubator/shindig/trunk/features/opensocial-jsonrpc/jsonrpccontainer.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-jsonrpc/jsonrpccontainer.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-jsonrpc/jsonrpccontainer.js
(original)
+++ incubator/shindig/trunk/features/opensocial-jsonrpc/jsonrpccontainer.js Thu
Jan 22 17:29:25 2009
@@ -72,7 +72,7 @@
recipientIds,
body);
};
-
+
/**
* Receives the returned results from the parent container.
@@ -85,10 +85,10 @@
*/
JsonRpcContainer.requestShareAppCallback_ = function(callbackId,
success, opt_errorCode, recipientIds) {
- callback = callbackIdStore[callbackId]
+ callback = callbackIdStore[callbackId];
if (callback) {
callbackIdStore[callbackId] = null;
-
+
var data = null;
if (recipientIds) {
data = {'recipientIds': recipientIds};
@@ -201,7 +201,7 @@
JsonRpcContainer.prototype.sendRequest = function(relativeUrl, callback,
params, contentType) {
gadgets.io.makeNonProxiedRequest(relativeUrl, callback, params,
contentType);
- }
+ };
JsonRpcContainer.generateErrorResponse = function(result, requestObjects,
callback) {
@@ -441,5 +441,5 @@
: null;
return new opensocial.ResponseItem(originalDataRequest,
error ? null : this.processData(rawJson), errorCode, errorMessage);
- }
+ };
};
Modified: incubator/shindig/trunk/features/opensocial-reference/mediaitem.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-reference/mediaitem.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-reference/mediaitem.js
(original)
+++ incubator/shindig/trunk/features/opensocial-reference/mediaitem.js Thu Jan
22 17:29:25 2009
@@ -65,7 +65,7 @@
VIDEO : 'video',
/** @member opensocial.MediaItem.Type */
AUDIO : 'audio'
-}
+};
/**
Modified: incubator/shindig/trunk/features/opensocial-rest/restfulcontainer.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-rest/restfulcontainer.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-rest/restfulcontainer.js
(original)
+++ incubator/shindig/trunk/features/opensocial-rest/restfulcontainer.js Thu
Jan 22 17:29:25 2009
@@ -200,7 +200,7 @@
RestfulContainer.prototype.getNetworkDistance = function(idSpec) {
var networkDistance = idSpec.getField('networkDistance') || '';
return "networkDistance=" + networkDistance;
-}
+};
RestfulContainer.prototype.newFetchPersonRequest = function(id, opt_params) {
var peopleRequest = this.newFetchPeopleRequest(
@@ -343,5 +343,5 @@
return new opensocial.ResponseItem(originalDataRequest,
error ? null : this.processData(rawJson), error, errorMessage);
- }
+ };
};
Modified: incubator/shindig/trunk/features/opensocial-templates/base.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/base.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/base.js (original)
+++ incubator/shindig/trunk/features/opensocial-templates/base.js Thu Jan 22
17:29:25 2009
@@ -18,11 +18,11 @@
*/
/**
* @fileoverview Prototype for OpenSocial Templates implementation.
- *
+ *
* Simple usage of templates:
* var template = os.compileTemplate("<span>Hello, ${name}</span>");
* template.renderInto(document.getElementById("output"), { name: "Bob" });
- *
+ *
* More complex usecase:
* var data = { ... };
* var template = os.compileTemplate(document.getElementById("template"));
@@ -30,7 +30,7 @@
* var output = template.render(data, context);
* // ... attach the output node ...
* os.fireCallbacks(context);
- *
+ *
* TODO(levik): Optimization:
* - Define all regexps as globals once, not once per function call.
* - Use queue-based DOM walker instead of recursion.
@@ -78,7 +78,7 @@
os.VAR_my = "$my";
os.VAR_cur = "$cur";
-os.VAR_node = "$node";
+os.VAR_node = "$node";
os.VAR_msg = "Msg";
os.VAR_parentnode = "$parentnode";
os.VAR_uniqueId = "$uniqueId";
@@ -98,7 +98,7 @@
* Preprocess the template.
* @param {Element|string} node DOM node containing the template data, or the
* string source.
- * @param {string} opt_id An optional ID for the new template.
+ * @param {string} opt_id An optional ID for the new template.
* @return {os.Template} A compiled Template object
*/
os.compileTemplate = function(node, opt_id) {
@@ -106,7 +106,7 @@
if (typeof(node) == "string") {
return os.compileTemplateString(node, opt_id);
}
-
+
opt_id = opt_id || node.id;
var src = node.value || node.innerHTML;
src = os.trim(src);
@@ -135,7 +135,7 @@
template.removeAttribute(STRING_id);
}
jstProcess(context, template);
- return template;
+ return template;
};
/**
@@ -158,11 +158,11 @@
os.markNodeToSkip(ret);
return ret;
- }
+ };
};
/**
- * Creates a functor which returns a value from the specified node given a
+ * Creates a functor which returns a value from the specified node given a
* name.
* @param {Node} node Node to get the value from.
* @return {Function} The functor which takes a type {string}.
@@ -171,12 +171,12 @@
os.createNodeAccessor_ = function(node) {
return function(name) {
return os.getValueFromNode_(node, name);
- }
+ };
};
/**
* A singleton instance of the current gadget Prefs - only instantiated if
- * we are in a gadget container.
+ * we are in a gadget container.
* @type gadgets.Prefs
*/
os.gadgetPrefs_ = null;
@@ -208,7 +208,7 @@
/**
* A map of custom attributes keyed by attribute name.
- * Maps {string} types onto Function({Element|string|Object|JSEvalContext}).
+ * Maps {string} types onto Function({Element|string|Object|JSEvalContext}).
* @type {Object}
* @private
*/
@@ -216,9 +216,9 @@
/**
* Registers a custom attribute functor. When this attribute is encountered in
- * a DOM node, the specified functor will be called.
+ * a DOM node, the specified functor will be called.
* @param {string} attrName The name of the custom attribute.
- * @param {Function} functor A function with signature
+ * @param {Function} functor A function with signature
* function({Element}, {string}, {Object}, {JSEvalContext})
*/
os.registerAttribute = function(attrName, functor) {
@@ -250,7 +250,7 @@
os.warn("Custom tag <" + ns + ":" + tag + "> not defined.");
return;
}
-
+
// Process tag's inner content before processing the tag.
for (var child = node.firstChild; child; child = child.nextSibling) {
if (child.nodeType == DOM_ELEMENT_NODE) {
@@ -258,7 +258,7 @@
os.markNodeToSkip(child);
}
}
-
+
var result = tagFunction.call(null, node, data, context);
if (!result && typeof(result) != "string") {
@@ -266,12 +266,12 @@
}
if (typeof(result) == "string") {
- node.innerHTML = result ? result : "";
+ node.innerHTML = result ? result : "";
} else if (isArray(result) && result.nodeType != DOM_TEXT_NODE) {
os.removeChildren(node);
for (var i = 0; i < result.length; i++) {
- if (result[i].nodeType &&
- (result[i].nodeType == DOM_ELEMENT_NODE ||
+ if (result[i].nodeType &&
+ (result[i].nodeType == DOM_ELEMENT_NODE ||
result[i].nodeType == DOM_TEXT_NODE)) {
node.appendChild(result[i]);
if (result[i].nodeType == DOM_ELEMENT_NODE) {
@@ -288,16 +288,16 @@
result.root.nodeType == DOM_ELEMENT_NODE) {
resultNode = result.root;
}
-
+
// Only attach the result DOM if it's not the same as the container node,
// or not already attached. In IE, detached nodes can be parented in
// DocumentFragments, so we check for that as well.
if (resultNode && resultNode != node && (
- !resultNode.parentNode ||
+ !resultNode.parentNode ||
result.parentNode.nodeType == DOM_DOCUMENT_FRAGMENT_NODE)) {
- os.removeChildren(node);
+ os.removeChildren(node);
node.appendChild(resultNode);
- os.markNodeToSkip(resultNode);
+ os.markNodeToSkip(resultNode);
}
if (result.onAttach) {
callbacks.push(result);
@@ -307,8 +307,8 @@
/**
- * Checks the current context, and if it's an element node, sets it to be used
- * for future <os:renderAll/> operations.
+ * Checks the current context, and if it's an element node, sets it to be used
+ * for future <os:renderAll/> operations.
*/
os.setContextNode_ = function(data, context) {
if (data.nodeType == DOM_ELEMENT_NODE) {
@@ -318,7 +318,7 @@
/**
* Mark the node to not be re-processed by continued template processing.
- * Useful if the node contains a template that needs to be processed with a
+ * Useful if the node contains a template that needs to be processed with a
* different context.
*/
os.markNodeToSkip = function(node) {
Modified: incubator/shindig/trunk/features/opensocial-templates/container.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/container.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/container.js
(original)
+++ incubator/shindig/trunk/features/opensocial-templates/container.js Thu Jan
22 17:29:25 2009
@@ -83,7 +83,7 @@
window.onload = function() {
oldOnLoad();
os.Container.onDomLoad_();
- }
+ };
}
};
Modified: incubator/shindig/trunk/features/opensocial-templates/data.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/data.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/data.js (original)
+++ incubator/shindig/trunk/features/opensocial-templates/data.js Thu Jan 22
17:29:25 2009
@@ -125,7 +125,7 @@
var self = this;
return function() {
self.sendRequest();
- }
+ };
};
/**
@@ -205,7 +205,7 @@
// Check to see if this one should fire immediately.
if (os.data.DataContext.isDataReady(listener.keys)) {
window.setTimeout(function() {
- listener.callback()
+ listener.callback();
}, 1);
}
};
@@ -404,7 +404,7 @@
var callbacks = os.data.currentAPIRequestCallbacks_;
return function(data) {
os.data.onAPIResponse(data, keys, callbacks);
- }
+ };
};
/**
@@ -488,7 +488,7 @@
var node = xml;
xml = node.value || node.innerHTML;
os.data.loadRequestsFromMarkup_(xml);
-}
+};
/**
* Parses XML data and constructs the pending request list.
Modified: incubator/shindig/trunk/features/opensocial-templates/loader.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/loader.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/loader.js (original)
+++ incubator/shindig/trunk/features/opensocial-templates/loader.js Thu Jan 22
17:29:25 2009
@@ -20,13 +20,13 @@
* @fileoverview OpenSocial Template loader. Can be used to load template
* libraries via URL. Supports Javascript and CSS injection.
*
- * Usage:
+ * Usage:
* os.Loader.loadUrl("/path/templatelib.xml", function() { doSomething(); });
- *
+ *
* or
* os.Loader.loadContent(
* "<Templates><Template tag="foo:bar">...</Template></Templates>");
- *
+ *
* The Template Library should have the following structure:
*
* <Templates xmlns:foo="http://foo.com/";>
@@ -43,12 +43,12 @@
* function usedByFooBaz() { ... };
* </JavaScript>
* </TemplateDef>
- * </Templates>
- *
+ * </Templates>
+ *
* TODO(levik): Implement dependency support - inject JS and CSS lazily.
* TODO(levik): More error handling and reporting of ill-formed XML files.
*/
-
+
os.Loader = {};
/**
@@ -97,7 +97,7 @@
}
};
req.send(null);
-}
+};
/**
* Fetch content remotely using the gadgets.io.makeRequest API.
@@ -135,7 +135,7 @@
} else {
os.Loader.loadUrl(urls.pop(), loadOne);
}
- }
+ };
loadOne();
};
@@ -207,11 +207,11 @@
if (tag) {
var tagParts = tag.split(":");
if (tagParts.length != 2) {
- throw "Invalid tag name: " + tag;
+ throw "Invalid tag name: " + tag;
}
var nsObj = os.getNamespace(tagParts[0]);
if (!nsObj) {
- throw "Namespace not registered: " + tagParts[0] +
+ throw "Namespace not registered: " + tagParts[0] +
" while trying to define " + tag;
}
var template = os.compileXMLNode(node);
@@ -227,7 +227,7 @@
* Processes the <JavaScript> node
*/
os.Loader.processJavaScriptNode = function(node, opt_tag) {
- for (var contentNode = node.firstChild; contentNode;
+ for (var contentNode = node.firstChild; contentNode;
contentNode = contentNode.nextSibling) {
// TODO(levik): Skip empty text nodes (with whitespace and newlines)
os.Loader.injectJavaScript(contentNode.nodeValue);
@@ -238,7 +238,7 @@
* Processes the <Style> node
*/
os.Loader.processStyleNode = function(node, opt_tag) {
- for (var contentNode = node.firstChild; contentNode;
+ for (var contentNode = node.firstChild; contentNode;
contentNode = contentNode.nextSibling) {
// TODO(levik): Skip empty text nodes (with whitespace and newlines)
os.Loader.injectStyle(contentNode.nodeValue);
Modified: incubator/shindig/trunk/features/opensocial-templates/namespaces.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/namespaces.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/namespaces.js
(original)
+++ incubator/shindig/trunk/features/opensocial-templates/namespaces.js Thu Jan
22 17:29:25 2009
@@ -26,29 +26,29 @@
* Map of namespace collections.
*
* Each namespace collection is either a map of tag handlers, or an object
- * that has a getTag(tagName) method that will return a tag handler based on
+ * that has a getTag(tagName) method that will return a tag handler based on
* name.
- *
+ *
* A tag handler function should be have the following signature:
* function({Element} node, {Object} data, {JSEvalContext} context)
- * where context is the JSEvalContext used to wrap data.
+ * where context is the JSEvalContext used to wrap data.
*
* For simpler implementations,
* function({Element} node, {Object} data)
* can be used, omitting the third param.
- *
- * Handler functions can return a string, a DOM Element or an Object with
+ *
+ * Handler functions can return a string, a DOM Element or an Object with
* {Element} root and, optionally, {Function} onAttach properties.
*
* @type {Object}
- * @private
+ * @private
*/
os.nsmap_ = {};
/**
* Map of namespace prefixes to full urls.
* @type {Object}
- * @private
+ * @private
*/
os.nsurls_ = {};
@@ -122,11 +122,11 @@
* Define 'os:renderAll' and 'os:Html' tags and the @onAttach attribute
*/
os.defineBuiltinTags = function() {
- var osn = os.getNamespace("os") ||
+ var osn = os.getNamespace("os") ||
os.createNamespace("os", "http://opensocial.com/#template";);
-
+
/**
- * <os:Render> custom tag renders the specified child nodes of the current
+ * <os:Render> custom tag renders the specified child nodes of the current
* context.
*/
osn.Render = function(node, data, context) {
@@ -134,7 +134,7 @@
var exp = node.getAttribute("content") || "*";
var result = os.getValueFromNode_(parent, exp);
if (!result) {
- return "";
+ return "";
} else if (typeof(result) == "string") {
var textNode = document.createTextNode(result);
result = [];
@@ -153,10 +153,10 @@
for (var i = 0; i < result[0].childNodes.length; i++) {
resultArray.push(result[0].childNodes[i]);
}
- result = resultArray;
+ result = resultArray;
}
- // Trim away leading and trailing spaces on IE, which interprets them
+ // Trim away leading and trailing spaces on IE, which interprets them
// literally.
if (os.isIe) {
for (var i = 0; i < result.length; i++) {
@@ -170,29 +170,29 @@
}
}
}
-
+
return result;
- }
+ };
osn.render = osn.RenderAll = osn.renderAll = osn.Render;
-
+
/**
* <os:Html> custom tag renders HTML content (as opposed to HTML code), so
- * <os:Html code="<b>Hello</b>"/> would result in the bold string "Hello",
- * rather than the text of the markup.
+ * <os:Html code="<b>Hello</b>"/> would result in the bold string "Hello",
+ * rather than the text of the markup.
*/
osn.Html = function(node) {
var html = node.code ? "" + node.code : node.getAttribute("code") || "";
// TODO(levik): Sanitize the HTML here to avoid script injection issues.
// Perhaps use the gadgets sanitizer if available.
return html;
- }
-
+ };
+
function createClosure(object, method) {
return function() {
method.apply(object);
- }
+ };
}
-
+
function processOnAttach(node, code, data, context) {
var callbacks = context.getVariable(os.VAR_callbacks);
var func = new Function(code);
Modified: incubator/shindig/trunk/features/opensocial-templates/os.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/os.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/os.js (original)
+++ incubator/shindig/trunk/features/opensocial-templates/os.js Thu Jan 22
17:29:25 2009
@@ -30,10 +30,10 @@
* <li>OpenSocial Field</li>
* <li>Data result set</li>
* </ul>
- * @param {Object} object The object in the scope of which to get a named
+ * @param {Object} object The object in the scope of which to get a named
* property.
* @param {string} name The name of the property to get.
- * @return {Object?} The property requested.
+ * @return {Object?} The property requested.
*/
os.resolveOpenSocialIdentifier = function(object, name) {
// Simple property from object.
@@ -67,7 +67,7 @@
}
return responseItem;
}
-
+
// Return undefined value, to avoid confusing with existing value of "null".
var und;
return und;
@@ -89,7 +89,7 @@
var getter = os.getPropertyGetterName(value);
object.prototype[getter] = function() {
this.getField(key);
- }
+ };
}
}
};
Modified: incubator/shindig/trunk/features/opensocial-templates/template_test.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-templates/template_test.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-templates/template_test.js
(original)
+++ incubator/shindig/trunk/features/opensocial-templates/template_test.js Thu
Jan 22 17:29:25 2009
@@ -399,9 +399,9 @@
}
root.onAttach = function() {
blink();
- }
+ };
return root;
- }
+ };
Clock.reset();
var outputNode = compileAndRender_("_T_Tag_blink");
@@ -442,7 +442,7 @@
'<div>Hello world!</div>',
null,
['<Template tag="os:HelloWorldWithParam">' + content + '</Template>']);
- }
+ };
tryTemplateContent('${$my.text}');
tryTemplateContent('${My.text}');
@@ -462,7 +462,7 @@
'<div>Hello world!</div>',
null,
['<Template tag="os:HelloWorldWithContent">' + content + '</Template>']);
- }
+ };
tryTemplateContent('<os:renderAll/>');
tryTemplateContent('<os:RenderAll/>');
@@ -482,7 +482,7 @@
'<div>Hello <b>world!</b></div>',
null,
['<Template tag="os:HelloWorldWithNamedContent">' + content +
'</Template>']);
- }
+ };
tryTemplateContent('<os:renderAll content="os:Content"/>');
tryTemplateContent('<os:renderAll content="Content"/>');
@@ -636,7 +636,7 @@
Words: ['Hello', 'world!'],
WordObjects: [{value: 'Hello'}, {value: 'world!'}]
});
- }
+ };
tryTemplateContent('<div><span
repeat="WordObjects">${$cur.value}</span></div>');
tryTemplateContent('<div><span repeat="WordObjects">${value}</span></div>');
@@ -746,7 +746,7 @@
var tryTemplateContent = function(templateText) {
var output = os.compileTemplateString(templateText).render();
assertEquals('Hello world!', domutil.getVisibleTextTrim(output));
- }
+ };
os.Loader.loadContent('<Templates xmlns:os="uri:unused">' +
'<Template tag="os:msg">${My.text}</Template></Templates>');
Modified: incubator/shindig/trunk/features/rpc/rpc.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/rpc/rpc.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/rpc/rpc.js (original)
+++ incubator/shindig/trunk/features/rpc/rpc.js Thu Jan 22 17:29:25 2009
@@ -36,16 +36,16 @@
// Consts for FrameElement.
var FE_G2C_CHANNEL = '__g2c_rpc';
var FE_C2G_CHANNEL = '__c2g_rpc';
-
+
// Consts for NIX. VBScript doesn't
// allow items to start with _ for some reason,
- // so we need to make these names quite unique, as
+ // so we need to make these names quite unique, as
// they will go into the global namespace.
var NIX_WRAPPER = 'GRPC____NIXVBS_wrapper';
var NIX_GET_WRAPPER = 'GRPC____NIXVBS_get_wrapper';
var NIX_HANDLE_MESSAGE = 'GRPC____NIXVBS_handle_message';
var NIX_CREATE_CHANNEL = 'GRPC____NIXVBS_create_channel';
-
+
// JavaScript reference to the NIX VBScript wrappers.
// Gadgets will have but a single channel under
// nix_channels['..'] while containers will have a channel
@@ -78,7 +78,7 @@
* + For those browsers that support native messaging (various
implementations
* of the HTML5 postMessage method), use that. Officially defined at
* http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html.
- *
+ *
* postMessage is a native implementation of XDC. A page registers that
* it would like to receive messages by listening the the "message" event
* on the window (document in DPM) object. In turn, another page can
@@ -88,7 +88,7 @@
* the message. The target page will then have its "message" event raised
* if the domain matches and can, in turn, check the origin of the message
* and process the data contained within.
- *
+ *
* wpm: postMessage on the window object.
* - Internet Explorer 8+
* - Safari (latest nightlies as of 26/6/2008)
@@ -101,8 +101,8 @@
* + For Internet Explorer before version 8, the security model allows anyone
* parent to set the value of the "opener" property on another window,
* with only the receiving window able to read it.
- * This method is dubbed "Native IE XDC" (NIX).
- *
+ * This method is dubbed "Native IE XDC" (NIX).
+ *
* This method works by placing a handler object in the "opener" property
* of a gadget when the container sets up the authentication information
* for that gadget (by calling setAuthToken(...)). At that point, a NIX
@@ -126,7 +126,7 @@
* domain C passes object obj to gadget on domain G. Then the gadget can
* access C's global context using:
* var parentWindow = (new obj.toString.constructor("return window;"))();
- * Nulling out all of obj's properties doesn't fix this, since IE
helpfully
+ * Nulling out all of obj's properties doesn't fix this, since IE helpfully
* restores them to their original values if you do something like:
* delete obj.toString; delete obj.toString;
* Thus, we wrap the necessary functions and information inside a VBScript
@@ -178,7 +178,7 @@
function getRelayChannel() {
return typeof window.postMessage === 'function' ? 'wpm' :
typeof document.postMessage === 'function' ? 'dpm' :
- window.ActiveXObject ? 'nix' :
+ window.ActiveXObject ? 'nix' :
navigator.product === 'Gecko' ? 'fe' :
'ifpc';
}
@@ -220,7 +220,7 @@
};
// Inject the VBScript code needed.
- var vbscript =
+ var vbscript =
// We create a class to act as a wrapper for
// a Javascript call, to prevent a break in of
// the context.
@@ -246,7 +246,7 @@
+ 'If isEmpty(m_Intended) Then\n'
+ 'm_Intended = name\n'
+ 'End If\n'
- + 'End Sub\n'
+ + 'End Sub\n'
// Method for internally setting the value of the m_Auth property.
+ 'Public Sub SetAuth(auth)\n '
@@ -255,11 +255,11 @@
+ 'End If\n'
+ 'End Sub\n'
- // A wrapper method which actually causes a
+ // A wrapper method which actually causes a
// message to be sent to the other context.
+ 'Public Sub SendMessage(data)\n '
+ NIX_HANDLE_MESSAGE + '(data)\n'
- + 'End Sub\n'
+ + 'End Sub\n'
// Returns the auth token to the gadget, so it can
// confirm a match before initiating the connection
@@ -454,7 +454,7 @@
// typeof(window.opener.GetAuthToken) check here
// because it means accessing that field on the COM object, which,
// being an internal function reference, is not allowed.
- // "in" works because it merely checks for the prescence of
+ // "in" works because it merely checks for the prescence of
// the key, rather than actually accessing the object's property.
// This is just a sanity check, not a validity check.
if (!handler && window.opener && "GetAuthToken" in window.opener) {
@@ -515,7 +515,7 @@
if (from != '..') {
// Call from gadget to the container.
var fe = window.frameElement;
-
+
if (typeof fe[FE_G2C_CHANNEL] === 'function') {
// Complete the setup of the FE channel if need be.
if (typeof fe[FE_G2C_CHANNEL][FE_C2G_CHANNEL] !== 'function') {
@@ -918,7 +918,7 @@
receiveSameDomain: function(rpc) {
// Pass through to local process method but converting to a local Array
rpc.a = Array.prototype.slice.call(rpc.a);
- window.setTimeout(function() { process(rpc) }, 0);
+ window.setTimeout(function() { process(rpc); }, 0);
}
};
}();
Modified: incubator/shindig/trunk/features/skins/skins.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/skins/skins.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/skins/skins.js (original)
+++ incubator/shindig/trunk/features/skins/skins.js Thu Jan 22 17:29:25 2009
@@ -63,7 +63,7 @@
getProperty : function(propertyKey) {
return skinProperties[propertyKey] || "";
}
- }
+ };
}();
/**
* @static
Modified: incubator/shindig/trunk/features/tabs/tabs.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/tabs/tabs.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/features/tabs/tabs.js (original)
+++ incubator/shindig/trunk/features/tabs/tabs.js Thu Jan 22 17:29:25 2009
@@ -494,7 +494,7 @@
this.tabsContainer_ = wrapper;
return table;
-}
+};
/**
* Helper method that shows or hides the navigation elements.
@@ -602,7 +602,7 @@
* @return {Function} Callback function to select the tab.
*/
gadgets.TabSet.prototype.setSelectedTabGenerator_ = function(tab) {
- return function() { tab.handle_.selectTab_(tab); }
+ return function() { tab.handle_.selectTab_(tab); };
};
/**
Modified: incubator/shindig/trunk/javascript/container/gadgets.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/gadgets.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/gadgets.js (original)
+++ incubator/shindig/trunk/javascript/container/gadgets.js Thu Jan 22 17:29:25
2009
@@ -260,7 +260,7 @@
} else {
return null;
}
-}
+};
gadgets.IfrGadgetService.prototype.getGadgetIdFromModuleId = function(
moduleId) {
@@ -454,7 +454,7 @@
*/
gadgets.Gadget.prototype.getAdditionalParams = function() {
return '';
-}
+};
// ---------
@@ -462,7 +462,7 @@
gadgets.IfrGadget = function(opt_params) {
gadgets.Gadget.call(this, opt_params);
- this.serverBase_ = '../../' // default gadget server
+ this.serverBase_ = '../../'; // default gadget server
};
gadgets.IfrGadget.inherits(gadgets.Gadget);
@@ -563,7 +563,7 @@
}
}
return params;
-}
+};
gadgets.IfrGadget.prototype.handleToggle = function() {
var gadgetIframe = document.getElementById(this.getIframeId());
@@ -607,7 +607,7 @@
var userPrefsDialog = document.getElementById(this.getUserPrefsDialogId());
userPrefsDialog.style.display = (opt_show || opt_show == undefined)
? '' : 'none';
-}
+};
gadgets.IfrGadget.prototype.hideUserPrefsDialog = function() {
this.showUserPrefsDialog(false);
Modified: incubator/shindig/trunk/javascript/container/sample-pubsub.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample-pubsub.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample-pubsub.html (original)
+++ incubator/shindig/trunk/javascript/container/sample-pubsub.html Thu Jan 22
17:29:25 2009
@@ -61,7 +61,7 @@
}
</script>
</head>
-<body onLoad="my.init();my.renderGadgets()">
+<body onLoad="my.init();my.renderGadgets();">
<h2>Sample: PubSub</h2>
<div id="gadget-chrome-0" class="gadgets-gadget-chrome"></div>
<div id="gadget-chrome-1" class="gadgets-gadget-chrome"></div>
Modified: incubator/shindig/trunk/javascript/container/sample1.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample1.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample1.html (original)
+++ incubator/shindig/trunk/javascript/container/sample1.html Thu Jan 22
17:29:25 2009
@@ -29,7 +29,7 @@
};
</script>
</head>
-<body onLoad="renderGadgets()">
+<body onLoad="renderGadgets();">
<h2>Sample: Simple Container</h2>
<div id="gadget-chrome-x" class="gadgets-gadget-chrome"></div>
<div id="gadget-chrome-y" class="gadgets-gadget-chrome"></div>
Modified: incubator/shindig/trunk/javascript/container/sample2.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample2.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample2.html (original)
+++ incubator/shindig/trunk/javascript/container/sample2.html Thu Jan 22
17:29:25 2009
@@ -46,7 +46,7 @@
};
</script>
</head>
-<body onLoad="my.init();my.renderGadgets()">
+<body onLoad="my.init();my.renderGadgets();">
<h2>Sample: Dynamic Height</h2>
<div id="gadget-chrome-0" class="gadgets-gadget-chrome"></div>
<div id="gadget-chrome-1" class="gadgets-gadget-chrome"></div>
Modified: incubator/shindig/trunk/javascript/container/sample3.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample3.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample3.html (original)
+++ incubator/shindig/trunk/javascript/container/sample3.html Thu Jan 22
17:29:25 2009
@@ -27,7 +27,7 @@
};
</script>
</head>
-<body onLoad="init();renderGadgets()">
+<body onLoad="init();renderGadgets();">
<h2>Sample: Container with FloatLeft Layout</h2>
<div id="layout-root" class="gadgets-layout-root"></div>
</body>
Modified: incubator/shindig/trunk/javascript/container/sample4.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample4.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample4.html (original)
+++ incubator/shindig/trunk/javascript/container/sample4.html Thu Jan 22
17:29:25 2009
@@ -25,7 +25,7 @@
};
</script>
</head>
-<body onLoad="init();renderGadgets()">
+<body onLoad="init();renderGadgets();">
<h2>Sample: set-pref support</h2>
<div id="gadget-parent" class="gadgets-gadget-parent"></div>
</body>
Modified: incubator/shindig/trunk/javascript/container/sample5.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample5.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample5.html (original)
+++ incubator/shindig/trunk/javascript/container/sample5.html Thu Jan 22
17:29:25 2009
@@ -25,7 +25,7 @@
};
</script>
</head>
-<body onLoad="init();renderGadgets()">
+<body onLoad="init();renderGadgets();">
<h2>Sample: set-pref support</h2>
<div id="gadget-parent" class="gadgets-gadget-parent"></div>
</body>
Modified: incubator/shindig/trunk/javascript/container/sample6.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample6.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample6.html (original)
+++ incubator/shindig/trunk/javascript/container/sample6.html Thu Jan 22
17:29:25 2009
@@ -25,7 +25,7 @@
};
</script>
</head>
-<body onLoad="init();renderGadgets()">
+<body onLoad="init();renderGadgets();">
<h2>Sample: dynamic-height support</h2>
<div id="gadget-parent" class="gadgets-gadget-parent"></div>
</body>
Modified: incubator/shindig/trunk/javascript/container/sample7.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/container/sample7.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/container/sample7.html (original)
+++ incubator/shindig/trunk/javascript/container/sample7.html Thu Jan 22
17:29:25 2009
@@ -24,7 +24,7 @@
};
</script>
</head>
-<body onLoad="init();renderGadgets()">
+<body onLoad="init();renderGadgets();">
<h2>Sample: settitle support</h2>
<div id="gadget-parent" class="gadgets-gadget-parent"></div>
</body>
Modified: incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js
(original)
+++ incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.js Thu
Jan 22 17:29:25 2009
@@ -37,7 +37,7 @@
*/
var parentUrl = document.location.href;
- var baseUrl = parentUrl.substring(0,
parentUrl.indexOf('samplecontainer.html'))
+ var baseUrl = parentUrl.substring(0,
parentUrl.indexOf('samplecontainer.html'));
// TODO: This is gross, it needs to use the config just like the gadget js
does
var socialDataPath = document.location.protocol + "//" +
document.location.host
@@ -96,7 +96,7 @@
SampleContainerGadget.inherits(gadgets.IfrGadget);
SampleContainerGadget.prototype.getAdditionalParams = function() {
- var params = ''
+ var params = '';
if (useCaja) {
params += "&caja=1";
@@ -145,7 +145,7 @@
function generateGadgets(metadata) {
// TODO: The gadget.js file should really have a clearGadgets method
- gadgets.container.view_ = current_view;
+ gadgets.container.view_ = current_view;
gadgets.container.gadgets_ = {};
for (var i = 0; i < metadata.gadgets.length; i++) {
gadget = gadgets.container.createGadget(
@@ -203,8 +203,8 @@
if (cacheUrlMatches && cacheUrlMatches[1] == "0") {
document.getElementById("useCacheCheckbox").checked = false;
}
- }
-
+ };
+
shindig.samplecontainer.initGadget = function() {
// Fetch cookies
var cookieGadgetUrl =
decodeURIComponent(shindig.cookies.get(gadgetUrlCookie));
@@ -228,14 +228,14 @@
document.getElementById("ownerId").value = ownerId;
requestGadgetMetaData(generateGadgets);
- }
+ };
shindig.samplecontainer.unpackFormState = function() {
useCaja = document.getElementById("useCajaCheckbox").checked;
useCache = document.getElementById("useCacheCheckbox").checked;
usePermissive = document.getElementById("usePermissiveCheckbox").checked;
doEvil = document.getElementById("doEvilCheckbox").checked;
- }
+ };
shindig.samplecontainer.changeGadgetUrl = function() {
shindig.samplecontainer.unpackFormState();
Modified: incubator/shindig/trunk/site/index.html
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/site/index.html?rev=736883&r1=736882&r2=736883&view=diff
==============================================================================
--- incubator/shindig/trunk/site/index.html (original)
+++ incubator/shindig/trunk/site/index.html Thu Jan 22 17:29:25 2009
@@ -107,7 +107,7 @@
var parent = anchor;
do {
parent = parent.parentNode;
- } while (parent && ! /.*Div$/.test(parent.id))
+ } while (parent && ! /.*Div$/.test(parent.id));
if (! parent)
return; // failed
var divMatch = /^(.*)Div$/g.exec(parent.id);
@@ -192,7 +192,7 @@
<li><a href="#eclipseProject">Setting up an Eclipse project</a></li>
<li><a href="#caja">Running with Caja</a></li>
</ul>
-
+
<h2>PHP</h2>
<ul>
<li><a href="#php">Building and running Shindig (PHP)</a></li>
@@ -201,7 +201,7 @@
<li><a href="#phpbuildTheCode">Running Shindig</a></li>
<li><a href="#phpAdditonal_reading">Additonal reading</a></li>
</ul>
-
+
<h3><a name="java">Building and running Shindig (Java)</a></h3>
<h4><a name="preReqs">Prequisites before building Shindig</a></h4>
<p>In order to build Shindig, you must have the following:</p>
@@ -372,58 +372,58 @@
instructions on how to start up any of the java shindig servers.
<p>Read <a
href="http://svn.apache.org/repos/asf/incubator/shindig/trunk/javascript/README";>javascript/README</a>
for instructions for using the Shindig Gadget Container JavaScript to
enable your page to render Gadgets.</p>
-
+
<h3><a name="php">Building and running Shindig PHP server</a></h3>
-
+
<h4><a name="phppreReqs">Prequisites before building Shindig for
PHP</a></h4>
<p> In order to build and run Shindig for PHP, you must have the
following: </p>
<ul>
<li>A Subversion client installed in order to checkout the
code.</li>
<ul><li>Instructions for downloading and installing Subversion can
be found here: <a
href="http://subversion.tigris.org/";></a>http://subversion.tigris.org/</li></ul>
-
+
<li>Apache with mod_rewrite enabled.</li>
<li>PHP 5.2.x with the <a href="http://www.php.net/json";>json</a>,
<a href="http://www.php.net/simplexml";>simplexml</a>, <a
href="http://www.php.net/mcrypt";>mcrypt</a> and <a
href="http://www.php.net/curl";>curl</a> extentions enabled.</li>
</ul>
-
+
<h4><a name="phpgetTheCode">Getting the code</a></h4>
- <p> Create a subdirectory in your web document root, e.g.
/var/www/html
+ <p> Create a subdirectory in your web document root, e.g.
/var/www/html
and checkout the Shindig code from its Subversion repository</p>
-
+
<ol>
<li> <code>mkdir /var/www/html/shindig</code> </li>
<li> <code>cd /var/www/html/shindig</code></li>
<li> <code>svn co
http://svn.apache.org/repos/asf/incubator/shindig/trunk/ .</code> </li>
</ol>
-
+
<h4><a name="phpbuildTheCode">Running Shindig</a></h4>
<p>With PHP There is no need to build anything - the source code is
already built.</p>
-
+
<p>To run the code, you have several options:</p>
-
+
<h5>a. Create a new virtual host</h5>
-
+
<p>Point your apache to the php dir with a virtual host like:</p>
-
+
<pre>
<VirtualHost your_ip:your_port>
-
+
ServerName your.host
DocumentRoot /var/www/html/shindig/php
... other normal settings in vhosts...
</VirtualHost>
</pre>
-
- <p>Restart apache, and point your browser to:</p>
+
+ <p>Restart apache, and point your browser to:</p>
<p>http://your.host/gadgets/ifr?url=http://www.labpixies.com/campaigns/todo/todo.xml</p>
-
- <p>you should see something like
+
+ <p>you should see something like
<a
href='http://shindig.chabotc.com/gadgets/ifr?url=http://www.labpixies.com/campaigns/todo/todo.xml'>this</a>.
</p>
-
+
<h5>b. Run with an existing host</h5>
-
+
<p>If you cannot/don't want to create a virtual host, you can edit
the file php/config.php and change the web_prefix setting to '/shindig/php'.
-
+
<p>Then you can run the gadget by pointing your browser to:
<p>http://your.host/shindig/php/gadgets/ifr?url=http://www.labpixies.com/campaigns/todo/todo.xml</p>
