Author: jmorliaguet
Date: Sat Jan 14 00:38:04 2006
New Revision: 2206

Modified:
   cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
   cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html
Log:

- fixes



Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Sat Jan 14 
00:38:04 2006
@@ -39,7 +39,7 @@
     var text = el.innerHTML;
     if (!text) return;
     try {
-      res = JSON.parse(text);
+      res = JSON.parse(text.unescapeHTML());
     } catch(e) {
       var div = document.createElement("div");
       Element.addClassName(div, "jsonParseError");
@@ -50,7 +50,7 @@
   },
 
   parse: function(node) {
-    var elements = document.getElementsByTagName("object");
+    var elements = node.getElementsByTagName("object");
     $A(elements).each(function(el, index) {
 
       var classid = el.getAttribute("classid");
@@ -712,7 +712,7 @@
     var widget = this.widget;
     var options = {
       onComplete: function() {
-        //CPSSkins.parse(widget);
+        CPSSkins.parse(widget);
       }
     };
 

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html    
    (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/panel5.html    
    Sat Jan 14 00:38:04 2006
@@ -23,59 +23,59 @@
         <object classid="cpsskins:view">
         {"widget": {
            "type": "panel",
-            url="panel1.html"
+           "url": "panel1.html"
          },
          "show_effect": {
            "transition": "fadein"
          },
          "perspectives": ["element-editor/1"]
-        }
+        }}
         </object>
       </td>
       <td>
         <object classid="cpsskins:view">
         {"widget": {
            "type": "panel",
-            url="panel2.html"
+           "url": "panel2.html"
          },
          "show_effect": {
            "transition": "fadein"
          },
          "perspectives": ["element-editor/1"]
-        }
+        }}
         </object>
       </td>
       <td>
         <object classid="cpsskins:view">
         {"widget": {
            "type": "panel",
-            url="panel3.html"
+            "url": "panel3.html"
          },
          "show_effect": {
            "transition": "fadein"
          },
          "perspectives": ["element-editor/2"]
-        }
+        }}
         </object>
       </td>
       <td>
         <object classid="cpsskins:view">
         {"widget": {
            "type": "panel",
-            url="panel4.html"
+           "url": "panel4.html"
          },
          "show_effect": {
            "transition": "fadein"
          },
          "perspectives": ["element-editor/2"]
-        }
+        }}
         </object>
       </td>
       <td>
         <object classid="cpsskins:view">
         {"widget": {
            "type": "panel",
-            url="panel6.html"
+           "url": "panel6.html"
          },
          "show_effect": {
            "transition": "fadein"
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to