Author: jmorliaguet Date: Sun Mar 12 17:52:32 2006 New Revision: 2623 Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/cpsskins_dragdrop_test.html cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/draggable.html Log:
- cosmetic 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 Sun Mar 12 17:52:32 2006 @@ -1143,7 +1143,10 @@ }, activate: function(node, options) { - var bg = node._saved_bg_color = node.getBackgroundColor(); + var bg = node.getBackgroundColor(); + if (!node._saved_bg_color) { + node._saved_bg_color = bg; + } Object.extend(options, { action: function(value) { node.setBackgroundColor({'r': bg.r, 'g': bg.g, 'b': bg.b-value}); 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 Sun Mar 12 17:52:32 2006 @@ -16,14 +16,12 @@ background-color: #efc; border: 1px solid #999; padding: 1em; - width: 200px; margin: 10px; } div.drop { background-color: #fff; border: 1px dotted #666; - padding: 2em; - width: 190px; + padding: 1em; margin: 10px; height: 40px; } @@ -42,8 +40,7 @@ #drophere { background-color: #fff; border: 1px dotted #666; - padding: 2em; - width: 190px; + padding: 1em; margin: 10px; height: 40px; } @@ -58,6 +55,8 @@ <h1>CPSSkins: drag-and-drop</h1> + <div style="width: 300px; float: left"> + <div class="dragdrop">DRAG-AND-DROP ME <div id="dragthis">DRAG ME</div> </div> @@ -131,12 +130,19 @@ } </ins> + </div> + + <div style="width: 200px; float: left"> + <div class="drop">DROP ZONE</div> <div id="drophere">DROP ME HERE</div> <div id="movethis">MOVE ME</div> + </div> + + <script type="text/javascript"> function displayInfo(event) { } Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/draggable.html ============================================================================== --- cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/draggable.html (original) +++ cpsskins/branches/jmo-perspectives/ui/framework/tests/functional/draggable.html Sun Mar 12 17:52:32 2006 @@ -1,4 +1,4 @@ -<div class="drag"> - DRAG ME +<div class="dragdrop"> + DRAG-AND-DROP ME </div> -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins