diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2011-02-28 22:49:49 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2011-02-28 22:49:49 +0100 |
| commit | f76e7498e71fb41d54daab7e028cff48809528d4 (patch) | |
| tree | 27e03d4932e30bd8e15d5d36a6fb0a900fa751ca | |
| parent | 2221dd6583e42633909cfca248145aae7d58d263 (diff) | |
| download | jquery-ui-f76e7498e71fb41d54daab7e028cff48809528d4.tar.gz jquery-ui-f76e7498e71fb41d54daab7e028cff48809528d4.zip | |
Menubar: Remove dependency on button and simplify CSS accordingly.
| -rw-r--r-- | tests/visual/menu/menubar.html | 1 | ||||
| -rw-r--r-- | tests/visual/menu/menubar.js | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/visual/menu/menubar.html b/tests/visual/menu/menubar.html index 180084edd..101a8edfb 100644 --- a/tests/visual/menu/menubar.html +++ b/tests/visual/menu/menubar.html @@ -53,7 +53,6 @@ /* menubar styles */ .ui-menubar .ui-button { float: left; font-weight: normal; border-top-width: 0 !important; border-bottom-width: 0 !important; margin: 0; } - .ui-menubar .ui-button.ui-corner-all { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; } .ui-menubar .ui-menubar-link { border-right: 1px dashed transparent; border-left: 1px dashed transparent; } diff --git a/tests/visual/menu/menubar.js b/tests/visual/menu/menubar.js index cb7c87e0b..57d9ee5de 100644 --- a/tests/visual/menu/menubar.js +++ b/tests/visual/menu/menubar.js @@ -57,15 +57,18 @@ $.widget("ui.menubar", { event.preventDefault(); event.stopPropagation(); }) - .button({ - icons: { - secondary: o.menuIcon ? (menu.length ? 'ui-icon-triangle-1-s' : '') : '' - } - }); + .addClass("ui-button ui-widget ui-button-text-only ui-menubar-link") + .wrapInner("<span class='ui-button-text'></span>"); + self._hoverable(input) + + if (o.menuIcon) { + input.addClass("ui-state-default").append("<span class='ui-button-icon-secondary ui-icon ui-icon-triangle-1-s'></span>"); + input.removeClass("ui-button-text-only").addClass("ui-button-text-icon-secondary"); + } - if (!o.buttons) { - input.addClass('ui-menubar-link').removeClass('ui-state-default'); - }; + if (!o.buttons) { + input.addClass('ui-menubar-link').removeClass('ui-state-default'); + }; }); $(document).click(function(event) { |