From f76e7498e71fb41d54daab7e028cff48809528d4 Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Mon, 28 Feb 2011 22:49:49 +0100
Subject: Menubar: Remove dependency on button and simplify CSS accordingly.

---
 tests/visual/menu/menubar.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tests/visual/menu/menubar.js')

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) {
-- 
cgit v1.2.3