svn commit: r641261 - in /incubator/shindig/trunk: features/opensocial-reference/container.js java/gadgets/pom.xml javascript/samplecontainer/examples/SocialActivitiesWorld.xml

[doll]

Author: doll
Date: Wed Mar 26 04:29:11 2008
New Revision: 641261

URL: http://svn.apache.org/viewvc?rev=641261&view=rev
Log:
Updated our caja version to r820. 
Fixed some cajoling errors in SocialActivitiesWorld 
Removed some unused code in container.js

Caja still isn't working quite right but hopefully we can get this sorted out 
again soon. 



Modified:
    incubator/shindig/trunk/features/opensocial-reference/container.js
    incubator/shindig/trunk/java/gadgets/pom.xml
    
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml

Modified: incubator/shindig/trunk/features/opensocial-reference/container.js
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-reference/container.js?rev=641261&r1=641260&r2=641261&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-reference/container.js 
(original)
+++ incubator/shindig/trunk/features/opensocial-reference/container.js Wed Mar 
26 04:29:11 2008
@@ -435,9 +435,7 @@
  */
 var caja;
 var ___;
-var html_sanitize;
 var attachDocumentStub;
-var plugin_dispatchEvent___;
 // See features/caja/domita.js for uriCallback's contract.
 var uriCallback = {
   rewrite: function rewrite(uri, mimeTypes) {
@@ -464,7 +462,6 @@
 
   ___ = window["___"];
   caja = window["caja"];
-  html_sanitize = window["html_sanitize"];
   attachDocumentStub = window["attachDocumentStub"];
 
   var outers = caja.copy(___.sharedOuters);

Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=641261&r1=641260&r2=641261&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed Mar 26 04:29:11 2008
@@ -220,7 +220,7 @@
     <dependency>
       <groupId>caja</groupId>
       <artifactId>caja</artifactId>
-      <version>r422</version>
+      <version>r820</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: 
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml?rev=641261&r1=641260&r2=641261&view=diff
==============================================================================
--- 
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml
 (original)
+++ 
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml
 Wed Mar 26 04:29:11 2008
@@ -16,7 +16,7 @@
 
   .streamtitle {
     background-color: #E0ECFF;
-    border-top 1px solid: blue;
+    border-top: 1px solid blue;
     padding: .25em;
   }
 
@@ -89,6 +89,12 @@
     float: right;
     width: 47%;
   }
+
+  #addActivity {
+    display:none;
+    border: 2px solid blue;
+    padding: .5em;
+  }
 </style>
 
 <script type="text/javascript">
@@ -107,7 +113,7 @@
 
 function postNewActivity() {
   var activityElement = document.getElementById('newActivity');
-  var mediaItem = [opensocial.newActivityMediaItem("image", 
viewer.getField('thumbnailUrl'), {'type' : 'IMAGE'})];
+  var mediaItem = new Array(opensocial.newActivityMediaItem("image", 
viewer.getField('thumbnailUrl'), {'type' : 'IMAGE'}));
   var activity = opensocial.newActivity({ 'title' : viewer.getDisplayName() + 
' wrote: ' + activityElement.value,
     'body' : 'write back!', 'mediaItems' : mediaItem});
 
@@ -137,7 +143,7 @@
     html += '<div class="streamdescription"><a href="' + activities[i].url + 
'">' + activities[i].getField('title') + '</a></div>';
 
     html += '<div class="streamcontents">';
-    html += '<img 
src="http://www.google.com/s2/sharing/resources/static/images/quot.png?hl=en_US"/>'
+    html += '<img 
src="http://www.google.com/s2/sharing/resources/static/images/quot.png?hl=en_US"/>';
 
     var body = activities[i].getField('body') || '';
     html += '<span class="streamhtmlcontents">' + body + '</span>';
@@ -178,10 +184,10 @@
 <div class="streamtitle">Activities from your friends</div>
 <div class="addActivityDiv">
   <a id="addActivityText" href="#" 
onclick="hideShowDiv('addActivity','addActivityText'); return false;"> Add your 
own activity </a>
-  <span id="addActivity" style="display:none; border: 2px solid steelblue; 
padding: .5em;">
-    <input id="newActivity" type="text"></input>
-    <input type="button" onclick="postNewActivity(); return false;" 
value="add"></input>
-    <input type="button" 
onclick="hideShowDiv('addActivityText','addActivity'); return false;" 
value="cancel"></input>
+  <span id="addActivity">
+    <input id="newActivity" type="text"/>
+    <input type="button" onclick="postNewActivity(); return false;" 
value="add"/>
+    <input type="button" 
onclick="hideShowDiv('addActivityText','addActivity'); return false;" 
value="cancel"/>
   </span>
 </div>
 <div id="stream" style="display:none"></div>