You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/02/20 19:21:21 UTC
svn commit: r629558 - in /incubator/shindig/trunk: features/core/config.js
java/gadgets/pom.xml javascript/samplecontainer/samplecontainer.html
Author: etnu
Date: Wed Feb 20 10:21:10 2008
New Revision: 629558
URL: http://svn.apache.org/viewvc?rev=629558&view=rev
Log:
Excluded caja from minification process as it appears to be introducing a subtle bug.
Updated sample container to pull in correct javascript from the server to match gadgets.js changes.
Added hasOwnProperty tests to config object iteration.
Modified:
incubator/shindig/trunk/features/core/config.js
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html
Modified: incubator/shindig/trunk/features/core/config.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/core/config.js?rev=629558&r1=629557&r2=629558&view=diff
==============================================================================
--- incubator/shindig/trunk/features/core/config.js (original)
+++ incubator/shindig/trunk/features/core/config.js Wed Feb 20 10:21:10 2008
@@ -118,15 +118,15 @@
*/
init: function(config, opt_noValidation) {
configuration = config;
- for (var name in components) {
+ for (var name in components) if (components.hasOwnProperty(name)) {
var component = components[name],
conf = config[name],
validators = component.validators;
if (!opt_noValidation) {
- for (var validator in validators) {
- if (!validators[validator](conf[validator])) {
- throw new Error('Invalid config value "' + conf[validator] +
- '" for parameter "' + validator + '" in component "' +
+ for (var v in validators) if (validators.hasOwnProperty(v)) {
+ if (!validators[v](conf[v])) {
+ throw new Error('Invalid config value "' + conf[v] +
+ '" for parameter "' + v + '" in component "' +
name + '"');
}
}
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=629558&r1=629557&r2=629558&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed Feb 20 10:21:10 2008
@@ -143,6 +143,8 @@
<exclude>**/*syndicator*.js</exclude>
<!-- open social files produce too many warnings -->
<exclude>**/opensocial-*/*</exclude>
+ <!-- Caja has some bugs too -->
+ <exclude>**/caja/*.js</exclude>
</excludes>
</configuration>
</plugin>
Modified: incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html?rev=629558&r1=629557&r2=629558&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html (original)
+++ incubator/shindig/trunk/javascript/samplecontainer/samplecontainer.html Wed Feb 20 10:21:10 2008
@@ -27,8 +27,7 @@
}
</style>
-<script type="text/javascript" src="../container/json.js"></script>
-<script type="text/javascript" src="../container/ifpc.js"></script>
+<script type="text/javascript" src="../../js/rpc.js?c=1"></script>
<script type="text/javascript" src="../container/cookies.js"></script>
<script type="text/javascript" src="../container/gadgets.js"></script>
<script type="text/javascript">