diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-07-25 11:53:14 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-07-25 11:53:14 -0400 |
| commit | 19a9de7e668cdb3b76c3b733d0147f1853cb38a5 (patch) | |
| tree | a259b421dd77cbec27e55db9b4d1104bf5214a2a /demos/menubar/default.html | |
| parent | daadc343be2f139e82719e2e5ff466aa19ec166f (diff) | |
| parent | 51ee3be39829e339c8e4bccb532347944e600ca5 (diff) | |
| download | jquery-ui-19a9de7e668cdb3b76c3b733d0147f1853cb38a5.tar.gz jquery-ui-19a9de7e668cdb3b76c3b733d0147f1853cb38a5.zip | |
Merge branch 'master' into core-1.6.1
Conflicts:
demos/menubar/default.html
tests/unit/autocomplete/autocomplete.html
tests/visual/effects/effects.all.html
ui/jquery.ui.menu.js
ui/jquery.ui.popup.js
Diffstat (limited to 'demos/menubar/default.html')
| -rw-r--r-- | demos/menubar/default.html | 119 |
1 files changed, 19 insertions, 100 deletions
diff --git a/demos/menubar/default.html b/demos/menubar/default.html index 121b12225..34742bb52 100644 --- a/demos/menubar/default.html +++ b/demos/menubar/default.html @@ -3,7 +3,7 @@ <head> <title>jQuery UI Menubar - Default demo</title> <link rel="stylesheet" href="../demos.css" type="text/css" /> - <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" /> + <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" /> <script src="../../jquery-1.6.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> @@ -13,56 +13,32 @@ <script src="../../ui/jquery.ui.menubar.js"></script> <script> $(function() { - $("td:has(.menubar)").clone().appendTo("tbody tr:not(:first)"); - - $("#bar1, .menubar").menubar({ - select: function(event, ui) { - $("<div/>").text("Selected: " + ui.item.text()).appendTo("#log"); + function select(event, ui) { + $("<div/>").text("Selected: " + ui.item.text()).appendTo("#log"); + if (ui.item.text() == 'Quit') { + $(this).menubar('destroy'); } + } + $("#bar1").menubar({ + position: { + within: $("#demo-frame").add(window).first() + }, + select: select }); - + $(".menubar-icons").menubar({ + autoExpand: true, menuIcon: true, buttons: true, - select: function(event, ui) { - $("<div/>").text("Selected: " + ui.item.text()).appendTo("#log"); - } + position: { + within: $("#demo-frame").add(window).first() + }, + select: select }); }); </script> - <style type="text/css"> - #bar1, #bar2 { margin: 0 0 4em; } /* style for this page only */ - .ui-menu { width: 200px; position: absolute; outline: none; z-index: 9999; } - .ui-menu .ui-icon { float: right; } - .ui-menu li.ui-state-disabled { - font-weight: bold; - padding: .0em .4em; - margin: .4em 0 .2em; - line-height: 1.5; - } - - /* menubar styles */ - .ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; outline: none; } - .ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; } - - .ui-menubar { - list-style: none; - margin: 0; - padding-left: 0; - } - - .ui-menubar-item { - float: left; - } - /* - table { - border-collapse: collapse; - } - th, td { - padding: 0.5em; - border: 1px solid black; - } - */ + <style> + #bar1, #bar2 { margin: 0 0 4em; } </style> </head> <body> @@ -160,63 +136,6 @@ </li> </ul> -<!-- -<table id="movies" class="ui-widget"> - <thead> - <tr> - <th data-field="Name" class="ui-widget-header">Name</th> - <th data-field="ReleaseYear" class="ui-widget-header">Release Year</th> - <th data-field="AverageRating" class="ui-widget-header">Average Rating</th> - <th class="ui-widget-header"></th> - </tr> - </thead> - <tbody> - <tr> - <td class="ui-widget-content">Red Hot Chili Peppers: Funky Monks</td> - <td class="ui-widget-content">1993</td> - <td class="ui-widget-content">3.6</td> - <td class="ui-widget-content"> - <ul class="menubar"> - <li> - <a href="#Options">Options</a> - <ul> - <li><a href="#Order...">Order...</a></li> - <li class="ui-state-disabled">Write a Review...</li> - <li><a href="#Find Similar Movies...">Find Similar Movies...</a></li> - <li> - <a href="#Rate">Rate</a> - <ul> - <li><a href="#5 stars">5 stars</a></li> - <li><a href="#4 stars">4 stars</a></li> - <li><a href="#3 stars">3 stars</a></li> - <li><a href="#2 stars">2 stars</a></li> - <li><a href="#1 stars">1 stars</a></li> - </ul> - </li> - </ul> - </li> - </ul> - </td> - </tr> - <tr> - <td class="ui-widget-content">Rod Stewart: Storyteller 1984-1991</td> - <td class="ui-widget-content">1991</td> - <td class="ui-widget-content">3.1</td> - </tr> - <tr> - <td class="ui-widget-content">Stevie Ray Vaughan and Double Trouble: Live at the El Mocambo 1983</td> - <td class="ui-widget-content">1991</td> - <td class="ui-widget-content">3.9</td> - </tr> - <tr> - <td class="ui-widget-content">Spike and Mike's Sick & Twisted Festival of Animation</td> - <td class="ui-widget-content">1997</td> - <td class="ui-widget-content">2.6</td> - </tr> - </tbody> -</table> ---> - <div class="ui-widget" style="margin-top:2em; font-family:Arial"> Log: <div id="log" style="height: 100px; width: 300px; overflow: auto;" class="ui-widget-content"></div> |