Author: jmorliaguet
Date: Sun Jan  8 20:31:50 2006
New Revision: 2195

Modified:
   cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_demo.html
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_tooltip.html
   cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
Log:

- we use "data: " instead of "model: ", since the data is only one part of
  the model



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 Sun Jan  8 
20:31:50 2006
@@ -263,7 +263,7 @@
 if (!window.Canvas) { var Canvas = new Object(); }
 Object.extend(Canvas, {
 
-  json_regexp: new RegExp(/^\smodel:/),
+  json_regexp: new RegExp(/^\sdata:/),
 
   _getCommentNode: function(element) {
     var node = $(element);
@@ -311,7 +311,7 @@
     if (node_id) {
       CPSSkins.Cache[node_id] = data;
     } else {
-      var comment = " model: " + JSON.stringify(data);
+      var comment = " data: " + JSON.stringify(data);
       comment = document.createComment(comment);
       var old = this._getCommentNode(node);
       if (old) {

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html
  (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html
  Sun Jan  8 20:31:50 2006
@@ -57,10 +57,10 @@
     </cpsskins:view>
 
 
-    <!-- model: {"copyable":true} -->
+    <!-- data: {"copyable":true} -->
     <div id="area1" class="pad">area1</div>
 
-    <!-- model:
+    <!-- data:
     {"formattable":true,
      "formats":[
       {"choice":"style","label":"Style"}
@@ -68,10 +68,10 @@
     -->
     <div id="area2" class="pad">area2</div>
 
-    <!-- model: {"editable":true} -->
+    <!-- data: {"editable":true} -->
     <div id="area3" class="pad">area3</div>
 
-    <!-- model:
+    <!-- data:
     {"editable":true,
      "formattable":true,
      "formats":[
@@ -89,7 +89,7 @@
     -->
     <div id="area4" class="pad">area4
 
-      <!-- model: {"editable":true} -->
+      <!-- data: {"editable":true} -->
       <div id="area5" class="pad">area5</div>
     </div>
   </div>

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_demo.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_demo.html
 (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_demo.html
 Sun Jan  8 20:31:50 2006
@@ -25,7 +25,7 @@
 
   <h1>CPSSkins panels</h1>
 
-  <!-- model:
+  <!-- data:
   {"perspectives":[
     {"choice":"site-designer","label":"Site designer"},
     {"choice":"page-designer","label":"Page designer"},

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
        (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_observer_test.html
        Sun Jan  8 20:31:50 2006
@@ -120,7 +120,7 @@
   <p>The views observe the model.
      When the model changes the views gets updated.</p>
 
-  <!-- model: {
+  <!-- data: {
     "size": 1,
     "sizeinfo": [{"choice":"", "label":""}]
   }

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_tooltip.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_tooltip.html
      (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_tooltip.html
      Sun Jan  8 20:31:50 2006
@@ -19,13 +19,13 @@
 
   <div id="area1">
 
-    <!-- model: {"hint":"Click here to open the document."} -->
+    <!-- data: {"hint":"Click here to open the document."} -->
     <a href="#">Open</a>
 
-    <!-- model: {"hint":"Click here to save the document."} -->
+    <!-- data: {"hint":"Click here to save the document."} -->
     <a href="#">Save</a>
 
-    <!-- model: {"hint":"Click here to close the document."} -->
+    <!-- data: {"hint":"Click here to close the document."} -->
     <a href="#">Close</a>
 
     <cpsskins:view
@@ -41,13 +41,13 @@
 
   <div id="area2">
 
-    <!-- model: {"hint":"Click here to open the file."} -->
+    <!-- data: {"hint":"Click here to open the file."} -->
     <a href="#">Open</a>
 
-    <!-- model: {"hint":"Click here to save the file."} -->
+    <!-- data: {"hint":"Click here to save the file."} -->
     <a href="#">Save</a>
 
-    <!-- model: {"hint":"Click here to close the file."} -->
+    <!-- data: {"hint":"Click here to close the file."} -->
     <a href="#">Close</a>
 
     <cpsskins:view

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html   
    (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html   
    Sun Jan  8 20:31:50 2006
@@ -30,17 +30,17 @@
   <div>
     <div id="e1"></div>
     <div>
-      <!-- model: {"a":"1","b":"2"} -->
+      <!-- data: {"a":"1","b":"2"} -->
       <div id="e2"></div>
       <div id="e3"></div>
       <div id="e4">
-        <!-- model: {"a":"1"} -->
+        <!-- data: {"a":"1"} -->
         <div></div>
         <div id="e5"></div>
       </div>
     </div>
     <div></div>
-    <!-- model:
+    <!-- data:
     {"a":["1","2","3"],
      "b":{"c":1,"d":2},
      "c":[[1],[2],[3]]}
@@ -312,7 +312,5 @@
 // ]]>
 </script>
 
-<div id="message"></div>
-
 </body>
 </html>

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
       (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
       Sun Jan  8 20:31:50 2006
@@ -29,10 +29,10 @@
 
 <div>
 
-  <!-- model: {"hint":"Tooltip hint for e0"} -->
+  <!-- data: {"hint":"Tooltip hint for e0"} -->
   <div id="e0"></div>
 
-  <!-- model: {"hint":"Tooltip hint for e1"} -->
+  <!-- data: {"hint":"Tooltip hint for e1"} -->
   <div id="e1"></div>
 
   <cpsskins:view widget="tooltip"></cpsskins:view>
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to