[Z3lab-checkins] r2088 - cpsskins/branches/jmo-perspectives/ui/framework/tests/functional

[svn]

Author: jmorliaguet
Date: Tue Dec 27 16:28:49 2005
New Revision: 2088

Modified:
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/contextualmenus.css
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_contextualmenu_test.html
   
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_tooltip.html
   cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/tooltip.css
Log:

- more explicit XML for declaring widgets, controls ...



Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/contextualmenus.css
==
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/contextualmenus.css
(original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/contextualmenus.css
Tue Dec 27 16:28:49 2005
@@ -46,7 +46,6 @@
 
 .contextMenu {
   position: absolute;
-  display: none;
   cursor: default;
   z-index: 2000;
   display: table;
@@ -64,8 +63,6 @@
 
 .contextMenu .submenu { 
   position: absolute;
-  top: auto;
-  left: auto;
   border-width: 1px 2px 2px 1px;
   border-style: solid;
   border-color: #333;
@@ -74,8 +71,6 @@
 
 .contextMenu .submenu a {
   background: #f6f3f3;
-  background-repeat: no-repeat;
-  background-position: 6px center;
 }
 
 .contextMenu .submenu a:hover {
@@ -83,10 +78,6 @@
   color: #fff;
 }
 
-.contextMenu .submenu  .items { /* ignored by IE */
-  margin-top: -20px;
-}
-
 
 .large {
   font: 11px Verdana, Arial, Helvetica, sans-serif;

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
  Tue Dec 27 16:28:49 2005
@@ -12,29 +12,13 @@
   link rel=stylesheet href=../test.css type=text/css /
   link rel=stylesheet href=contextualmenus.css type=text/css /
 
-  script type=text/javascript
-function displayChoice(selected, choice) {
-  alert('You have clicked on ' + selected.getAttribute('id')
-+ ' and selected the ' + choice + ' menu item.');
-}
-var menu_actions = new CPSSkins.Controller('actions');
-menu_actions.add({
-  'edit': displayChoice,
-  'copy': displayChoice,
-  'paste': displayChoice,
-  'format': displayChoice,
-  'delete': displayChoice,
-  });
-
-  /script
-
 /head
 
 body
 
   h1CPSSkins Contextual menus/h1
 
-  div id=message.../div
+  pre id=message.../pre
 
   div style=float: left; margin: 1em
 h2Menu 1/h2
@@ -53,29 +37,72 @@
   div style=float: left; margin: 1em
 h2Menu 2/h2
 div id=testArea2
-  div id=area6 class=pad editable=1 formattable=1area6/div
+  div id=area6 class=pad editable=1 formattable=1
+   targets=here:Paste here,above:Paste above
+   formats=style:Style,widget:Widgetarea6/div
 /div
   /div
 
-  cpsskins:contextmenu controller=actions area=testArea1 class=large
-item action=edit visible=editableEdit/item
-item action=copyCopy/item
-item action=paste visible=editablePaste/item
-item action=format visible=formatFormattable/item
-item action=delete visible=editable
-  confirm=Deleting, are you sure?Delete/item
-  /cpsskins:contextmenu
+  cpsskins:contextmenu
+  controller=controller
+  area=testArea1
+  class=large
+
+item
+label=Edit
+action=edit
+visible=editable
+/
+
+item
+label=Copy
+action=copy
+/
+
+item
+label=Paste
+action=paste
+visible=editable
+/
+
+submenu
+label=Format
+visible=formattable
+
+  items
+  action=format
+  choices=formats
+  /
+
+/submenu
+
+item
+label=Delete
+action=delete
+visible=editable
+confirm=Deleting, are you sure?
+/
 
-  cpsskins:contextmenu controller=actions area=testArea2 class=small
-item action=edit visible=editableEdit/item
-item action=copyCopy/item
-item action=paste visible=editablePaste/item
-item action=format visible=formatFormattable/item
-item action=delete visible=editable
-  confirm=Deleting, are you sure?Delete/item
   /cpsskins:contextmenu
 
 
+
+  script type=text/javascript
+function displayChoice(selected, choice) {
+  alert('You have clicked on ' + selected.getAttribute('id')
++ ' and selected the ' + choice + ' menu item.');
+}
+
+new CPSSkins.Controller('controller').register({
+  'edit': displayChoice,
+  'copy': displayChoice,
+  'paste': displayChoice,
+  'format': displayChoice,
+  'delete': displayChoice
+});
+
+  /script
+
 /body
 
 /html

[Z3lab-checkins] r2090 - in cpsskins/branches/jmo-perspectives/ui/framework: . tests/unit

[svn]

Author: jmorliaguet
Date: Tue Dec 27 23:39:15 2005
New Revision: 2090

Modified:
   cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
   cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Log:

- implementation of Identiable.getData() / test fix



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 Tue Dec 27 
23:39:15 2005
@@ -128,6 +128,23 @@
   if (this.isIdentifiable(nodes[i])) { return false; }
 }
 return true;
+  },
+
+  getData: function(element) {
+var node = $(element);
+while(true) {
+  node = node.previousSibling;
+  if (!node) return null;
+  var type = node.nodeType;
+  if (type == 1) return null;
+  if (type == 8) {
+var comment = node.nodeValue;
+comment = comment.replace(/(^\[CDATA\[|\]\]$)/gm, '');
+   if (!comment) return null;
+return JSON.parse(comment);
+  }
+}
+return null;
   }
 
 });

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   
Tue Dec 27 23:39:15 2005
@@ -4,6 +4,7 @@
 head
   titleCPSSkins Unit test file/title
   meta http-equiv=content-type content=text/html; charset=utf-8 /
+  script src=../../json.js type=text/javascript/script
   script src=../../prototype.js type=text/javascript/script
   script src=../../cpsskins.js type=text/javascript/script
   script src=../unittest.js type=text/javascript/script
@@ -37,7 +38,7 @@
 ![CDATA[{
 a:1,
 b:{c:1,d:2}
-  }]]
+  }]]
 div id=e6/div
   /div
 /div
@@ -116,9 +117,11 @@
 
 testGetData: function() { with(this) {
   assertEqual(Identifiable.getData(e1), null);
-  assertEqual(Identifiable.getData(e2), {a:1,b:2});
+  assertEqual($H(Identifiable.getData(e2)).inspect(),
+  $H({a:1, b:2}).inspect());
   assertEqual(Identifiable.getData(e5), null);
-  assertEqual(Identifiable.getData(e6), {a:1,b:{c:1,d:2}});
+  assertEqual($H(Identifiable.getData(e6)).inspect(),
+  $H({a:1,b:{c:1,d:2}}).inspect());
 }}
 
   });
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

[Z3lab-checkins] r2091 - cpsskins/branches/jmo-perspectives/ui/framework

[svn]

Author: jmorliaguet
Date: Wed Dec 28 00:09:20 2005
New Revision: 2091

Modified:
   cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
Log:

- fix for Opera



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 Wed Dec 28 
00:09:20 2005
@@ -137,10 +137,10 @@
   if (!node) return null;
   var type = node.nodeType;
   if (type == 1) return null;
-  if (type == 8) {
+  if (type == 8 || type == 4) {
 var comment = node.nodeValue;
 comment = comment.replace(/(^\[CDATA\[|\]\]$)/gm, '');
-   if (!comment) return null;
+if (!comment) return null;
 return JSON.parse(comment);
   }
 }
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins