diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-10-03 22:37:03 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-10-03 22:37:03 +0200 |
| commit | cca4e77a95eb7024c204f4d0719baa2ef6195ed2 (patch) | |
| tree | 732a8e171647d9b25b1b2988f09dccc5d182bad7 /demos/droppable/propagation.html | |
| parent | 5e12c54be1813e1f627d3214c11d7520fb46c647 (diff) | |
| parent | e8bdf468614e59309b4a02ad4f6c29c1d06083c1 (diff) | |
| download | jquery-ui-cca4e77a95eb7024c204f4d0719baa2ef6195ed2.tar.gz jquery-ui-cca4e77a95eb7024c204f4d0719baa2ef6195ed2.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos/droppable/propagation.html')
| -rw-r--r-- | demos/droppable/propagation.html | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/demos/droppable/propagation.html b/demos/droppable/propagation.html index 6cdbf3cc1..4aae2fcab 100644 --- a/demos/droppable/propagation.html +++ b/demos/droppable/propagation.html @@ -1,10 +1,10 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="utf-8"> <title>jQuery UI Droppable - Prevent propagation</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.8.0.js"></script> + <script src="../../jquery-1.8.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> @@ -48,8 +48,6 @@ </head> <body> -<div class="demo"> - <div id="draggable" class="ui-widget-content"> <p>Drag me to my target</p> </div> @@ -68,13 +66,8 @@ </div> </div> -</div><!-- End demo --> - - - <div class="demo-description"> <p>When working with nested droppables — for example, you may have an editable directory structure displayed as a tree, with folder and document nodes — the <code>greedy</code> option set to true prevents event propagation when a draggable is dropped on a child node (droppable).</p> -</div><!-- End demo-description --> - +</div> </body> </html> |