Author: jmorliaguet
Date: Mon Mar 13 21:13:13 2006
New Revision: 2635

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

- interaction fixes / test updates



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 Mon Mar 13 
21:13:13 2006
@@ -668,7 +668,7 @@
     var y = Event.pointerY(e);
     this.x0 = pos[0];
     this.y0 = pos[1];
-    if (this.def.dragging.shift) {
+    if (this.def.dragging.shift || this.def.dragging.container) {
       this.x1 = -5;
       this.y1 = -5;
     } else {
@@ -747,7 +747,7 @@
 
     var container = this.def.dragging.container;
     if (container && el.hasClassName(container)) {
-      el.appendChild(this.dragged)
+      el.appendChild(this.dragged);
     }
 
     Event.stop(e);

Modified: 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_dragdrop_test.html
==============================================================================
--- 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_dragdrop_test.html
        (original)
+++ 
cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_dragdrop_test.html
        Mon Mar 13 21:13:13 2006
@@ -30,8 +30,8 @@
   }
   #dragthis {
     padding: 1em;
-    border: 1px solid #f90;
-    background-color: #ffc;
+    border: 1px solid #fc0;
+    background-color: #ff3;
   }
   #movethis {
     padding: 1em;
@@ -47,10 +47,6 @@
     margin: 10px;
     height: 40px;
   }
-  #dragthis {
-    padding: 1em;
-    border: 1px solid #fc0;
-  }
   .block {
     border: 1px solid #000;
     background-color: #ffc;
@@ -101,10 +97,12 @@
    "action": "displayInfo",
    "dragging": {
      "sources": ["#dragthis"],
+     "shift": "block",
+     "container": "container",
      "feedback": {
        "opacity": 0.8,
        "border": "#000",
-       "background": "#9c3"
+       "background": "#ff0"
      }
    }
   }}
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to