diff options
| author | Richard Worth <rdworth@gmail.com> | 2009-01-01 00:27:45 +0000 |
|---|---|---|
| committer | Richard Worth <rdworth@gmail.com> | 2009-01-01 00:27:45 +0000 |
| commit | db5edc794f7b9479cd02a05d0fe0d690b71ffaf7 (patch) | |
| tree | f3dc177b199381840bb0d9ba0ec57ee307527a2e /demos/droppable | |
| parent | 48af692c1bc73e132dd7f140e45c422ee5dc05a1 (diff) | |
| download | jquery-ui-db5edc794f7b9479cd02a05d0fe0d690b71ffaf7.tar.gz jquery-ui-db5edc794f7b9479cd02a05d0fe0d690b71ffaf7.zip | |
demos: touch up
Diffstat (limited to 'demos/droppable')
| -rw-r--r-- | demos/droppable/greedy.html | 14 | ||||
| -rw-r--r-- | demos/droppable/index.html | 13 | ||||
| -rw-r--r-- | demos/droppable/tolerance.html | 93 |
3 files changed, 13 insertions, 107 deletions
diff --git a/demos/droppable/greedy.html b/demos/droppable/greedy.html index 9aa1b5675..9d6be3ad7 100644 --- a/demos/droppable/greedy.html +++ b/demos/droppable/greedy.html @@ -9,9 +9,9 @@ <script type="text/javascript" src="../../ui/ui.droppable.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> <style type="text/css"> - #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } - #droppable, #droppable2 { width: 200px; height: 160px; padding: 0.5em; float: left; margin: 10px; } - #droppable-inner, #droppable2-inner { width: 140px; height: 100px; padding: 0.5em; float: left; margin: 10px; } + #draggable { width: 100px; height: 40px; padding: 0.5em; float: left; margin: 10px; } + #droppable, #droppable2 { width: 230px; height: 120px; padding: 0.5em; float: left; margin: 10px; } + #droppable-inner, #droppable2-inner { width: 170px; height: 60px; padding: 0.5em; float: left; margin: 10px; } </style> <script type="text/javascript"> $(function() { @@ -46,16 +46,16 @@ </div> <div id="droppable" class="ui-widget-header"> - <p>Outer droppable (greedy deactivated)</p> + <p>Outer droppable</p> <div id="droppable-inner" class="ui-widget-header"> - <p>Inner droppable (greedy deactivated)</p> + <p>Inner droppable (not greedy)</p> </div> </div> <div id="droppable2" class="ui-widget-header"> - <p>Outer droppable (greedy deactivated)</p> + <p>Outer droppable</p> <div id="droppable2-inner" class="ui-widget-header"> - <p>Inner droppable (greedy deactivated)</p> + <p>Inner droppable (greedy)</p> </div> </div> diff --git a/demos/droppable/index.html b/demos/droppable/index.html index 6fd371a25..cc45f31b1 100644 --- a/demos/droppable/index.html +++ b/demos/droppable/index.html @@ -9,13 +9,12 @@ <div class="demos-nav"> <h4>Examples</h4> <ul> - <li class="demo-config-on"><a href="default.html">Default</a></li> - <li><a href="accept.html">accept</a></li> - <li><a href="hoverclass.html">hoverClass</a></li> - <li><a href="activeclass.html">activeClass</a></li> - <li><a href="greedy.html">greedy</a></li> - <li><a href="tolerance.html">tolerance</a></li> - <li><a href="revert.html">revert</a></li> + <li class="demo-config-on"><a href="default.html">Default Droppable</a></li> + <li><a href="accept.html">Accept</a></li> + <li><a href="hoverclass.html">Hover Class</a></li> + <li><a href="activeclass.html">Active Class</a></li> + <li><a href="greedy.html">Greedy</a></li> + <li><a href="revert.html">Revert</a></li> </ul> </div> diff --git a/demos/droppable/tolerance.html b/demos/droppable/tolerance.html deleted file mode 100644 index 5447673b7..000000000 --- a/demos/droppable/tolerance.html +++ /dev/null @@ -1,93 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title>jQuery UI Droppable - Tolerance Demo</title> - <link type="text/css" href="../../themes/default/ui.all.css" rel="stylesheet" /> - <script type="text/javascript" src="../../jquery-1.2.6.js"></script> - <script type="text/javascript" src="../../ui/ui.core.js"></script> - <script type="text/javascript" src="../../ui/ui.draggable.js"></script> - <script type="text/javascript" src="../../ui/ui.droppable.js"></script> - <link type="text/css" href="../demos.css" rel="stylesheet" /> - <style type="text/css"> - #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px; } - #dropppable, #dropppable-fit, #dropppable-pointer, #dropppable-touch { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } - </style> - <script type="text/javascript"> - $(function() { - - $("#draggable").draggable(); - - $("#droppable").droppable({ - activeClass: 'ui-state-hover', - hoverClass: 'ui-state-active', - drop: function(event, ui) { - $(this).addClass('ui-state-highlight').find('p').html('Dropped!'); - } - }); - - $("#droppable-fit").droppable({ - activeClass: 'ui-state-hover', - hoverClass: 'ui-state-active', - tolerance: 'fit', - drop: function(event, ui) { - $(this).addClass('ui-state-highlight').find('p').html('Dropped!'); - } - }); - - $("#droppable-pointer").droppable({ - activeClass: 'ui-state-hover', - hoverClass: 'ui-state-active', - tolerance: 'pointer', - drop: function(event, ui) { - $(this).addClass('ui-state-highlight').find('p').html('Dropped!'); - } - }); - - $("#droppable-touch").droppable({ - activeClass: 'ui-state-hover', - hoverClass: 'ui-state-active', - tolerance: 'touch', - drop: function(event, ui) { - $(this).addClass('ui-state-highlight').find('p').html('Dropped!'); - } - }); - - }); - </script> -</head> -<body> -<div class="demo"> - -<div id="draggable" class="ui-widget-content"> - <p>Drag me to my target</p> -</div> - -<br clear="both" /> - -<div id="droppable" class="ui-widget-header"> - <p>Default tolerance</p> -</div> - -<div id="droppable-fit" class="ui-widget-header"> - <p>tolerance: 'fit'</p> -</div> - -<div id="droppable-pointer" class="ui-widget-header"> - <p>tolerance: 'pointer'</p> -</div> - -<div id="droppable-touch" class="ui-widget-header"> - <p>tolerance: 'touch'</p> -</div> - -</div><!-- End demo --> - -<div class="demo-description"> - -<p> -<!-- Add description here --> -</p> - -</div><!-- End demo-description --> -</body> -</html> |