diff --git a/build/build.xml b/build/build.xml index 49568b3ccb..ddaa5b86d9 100644 --- a/build/build.xml +++ b/build/build.xml @@ -123,6 +123,12 @@ + + + + + + diff --git a/tests/visual/selectmenu/autocomplete.html b/tests/visual/selectmenu/autocomplete.html deleted file mode 100644 index b9c1616998..0000000000 --- a/tests/visual/selectmenu/autocomplete.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - jQuery UI Selectmenu - Event functionality - - - - - - - - - - - - - - - -
- - -
-
- - -
-
- -
-
-
-
-
-
-
-
-
- -
- - -
- -
- - - - - diff --git a/tests/visual/selectmenu/tabs.html b/tests/visual/selectmenu/compatibility .html similarity index 71% rename from tests/visual/selectmenu/tabs.html rename to tests/visual/selectmenu/compatibility .html index 658da8a20c..a99a629df8 100644 --- a/tests/visual/selectmenu/tabs.html +++ b/tests/visual/selectmenu/compatibility .html @@ -2,21 +2,52 @@ - jQuery UI Selectmenu - Event functionality + jQuery UI Selectmenu - Compatibility with other widgets + +
+
+ + +
+
+

Some example content

+

Test Link

+
+
+ + +
+
+
+
diff --git a/tests/visual/selectmenu/dialog.html b/tests/visual/selectmenu/dialog.html deleted file mode 100644 index f800839333..0000000000 --- a/tests/visual/selectmenu/dialog.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - jQuery UI Selectmenu - Event functionality - - - - - - - - - - - - - - - -
- - -
-

Some example content

-

Test Link

-
-
- - -
-
-
- - -
-

Sed vel diam id libero rutrum convallis. Donec aliquet leo vel magna. Phasellus rhoncus faucibus ante. Etiam bibendum, enim faucibus aliquet rhoncus, arcu felis ultricies neque, sit amet auctor elit eros a lectus.

-
-
- checkbox
- radio
-

-
-
-
- - -
- - - - - diff --git a/tests/visual/selectmenu/events.html b/tests/visual/selectmenu/events.html index e17434add7..7371e1373e 100644 --- a/tests/visual/selectmenu/events.html +++ b/tests/visual/selectmenu/events.html @@ -2,7 +2,7 @@ - jQuery UI Selectmenu - Event functionality + jQuery UI Selectmenu - Events functionality diff --git a/tests/visual/selectmenu/methods.html b/tests/visual/selectmenu/methods.html index 5476dfff8f..b3e5a42e53 100644 --- a/tests/visual/selectmenu/methods.html +++ b/tests/visual/selectmenu/methods.html @@ -2,7 +2,7 @@ - jQuery UI Selectmenu - Event functionality + jQuery UI Selectmenu - Methids functionality diff --git a/tests/visual/selectmenu/option.html b/tests/visual/selectmenu/option.html index fef35ab9f2..308a9ebc2b 100644 --- a/tests/visual/selectmenu/option.html +++ b/tests/visual/selectmenu/option.html @@ -2,7 +2,7 @@ - jQuery UI Selectmenu - Event functionality + jQuery UI Selectmenu - Option functionality diff --git a/tests/visual/selectmenu/themeswitcher.html b/tests/visual/selectmenu/themeswitcher.html new file mode 100644 index 0000000000..c533fc4ae5 --- /dev/null +++ b/tests/visual/selectmenu/themeswitcher.html @@ -0,0 +1,104 @@ + + + + + jQuery UI Selectmenu - Themeswitcher functionality + + + + + + + + + + + + + + +
+ +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ +
+ + + + + + + diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 77190189e7..0263cff652 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -20,7 +20,7 @@ $.widget( "ui.menu", { defaultElement: "
    ", delay: 150, options: { - items: "ul", + menus: "ul", position: { my: "left top", at: "right top" @@ -250,7 +250,7 @@ $.widget( "ui.menu", { refresh: function() { // initialize nested menus - var submenus = this.element.find( this.options.items + ":not( .ui-menu )" ) + var submenus = this.element.find( this.options.menus + ":not( .ui-menu )" ) .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) .attr( "role", "menu" ) .hide()