Skip to content

All: Classes Option #1369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arschmitz wants to merge 47 commits into from
Closed

All: Classes Option #1369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
891a7d9
Widget: add the _classes method.
petersendidit Oct 19, 2012
6a6446b
Tabs: use the _classes method.
petersendidit Oct 19, 2012
07f52c1
Dialog: use the _classes method.
petersendidit Apr 23, 2013
f8c5aea
Accordion: use the _classes method.
petersendidit Apr 23, 2013
544f9ff
Autocomplete: use the _classes method.
petersendidit Apr 24, 2013
3c52f19
Slider: use the _classes method.
petersendidit Apr 24, 2013
b1c0f22
Spinner: use the _classes method.
petersendidit Apr 24, 2013
43ec02b
Progressbar: use the _classes method.
petersendidit Apr 24, 2013
51d1d33
Menu: use the _classes method.
petersendidit Apr 25, 2013
0aa2e1f
Tooltip: use the _classes method.
petersendidit Apr 25, 2013
9562d7a
Selectmenu: use the _classes method.
petersendidit Aug 23, 2014
808bb7f
Widget: Process "classes" option during _setOption()
Sep 5, 2014
a813056
Widget: Avoid adding extra spaces to the result of this._classes(...)
Oct 23, 2014
330dc7e
Widget: Add tests for classes option setting
arschmitz Nov 5, 2014
157ba04
Autocomplete: Implement _elementsFromFromClassKey()
Sep 5, 2014
8c0b1ac
Accordion: Implementing _elementsFromClassKey()
Sep 5, 2014
dfaba1d
Dialog: Add support for setOption with classes
arschmitz Oct 15, 2014
af57abd
Menu: Add support for setOption with classes
arschmitz Oct 15, 2014
aa4bbb3
Progressbar: Add support for setOption with classes
arschmitz Oct 15, 2014
e59c360
Selectmenu: Add support for setOption with classes
arschmitz Oct 15, 2014
d93e475
Slider: Add support for setOption with classes
arschmitz Oct 15, 2014
31dcc86
Spinner: Add support for setOption with classes
arschmitz Oct 15, 2014
2a0b8eb
Tabs: Add support for setOption with classes
arschmitz Oct 15, 2014
69bdbfc
Tooltip: Add support for setOption with classes
arschmitz Oct 21, 2014
b238f36
Accordion: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
c31c9f1
Autocomplete: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
9ab23dc
Dialog: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
c5ada6d
Menu: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
98a2cc7
Progressbar: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
7c7acda
Slider: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
836feb5
Spinner: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
b97ff0e
Tabs: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
5dd9120
Tooltip: Update classes option to use empty string instead of null
arschmitz Oct 15, 2014
e183631
Dialog: Fix checking of $.uiBackcompat in tests
arschmitz Nov 5, 2014
7628f28
Tooltip: Update checking of $.uiBackcompat in tests
arschmitz Nov 5, 2014
cecd4e2
Dialog: Simplify tests for classes
arschmitz Nov 5, 2014
328308a
Accordion: Simplify tests for classes
arschmitz Nov 5, 2014
758ff6c
Menu: Simplify tests for classes
arschmitz Nov 5, 2014
21fbfa3
Progressbar: simplify tests for classes
arschmitz Nov 5, 2014
7382fd3
Selectmenu: Simplify tests for classes
arschmitz Nov 5, 2014
3ac52a8
Slider: Simplify tests for classes
arschmitz Nov 5, 2014
ab96209
Tabs: Simplify tests for classes
arschmitz Nov 5, 2014
0fec7d4
Selectmenu: Remove unneeded comment
arschmitz Nov 7, 2014
ef9ed64
Tooltip: Remove deprecated tooltip class replaces with classes option
arschmitz Nov 7, 2014
913edd3
Autocomplete: Remove use of deprecated tooltipClass option in demo
arschmitz Nov 7, 2014
a0b707b
Menu: Update for menu wrapper
arschmitz Nov 7, 2014
7a3eaa8
Menu: fix incorrect default classes value
arschmitz Nov 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Menu: Update for menu wrapper
  • Loading branch information
@arschmitz
arschmitz committed Nov 7, 2014
commit a0b707bf9dce9c0df1b5ba9c8a3b6dca3148abb3
1 change: 1 addition & 0 deletions tests/unit/menu/menu_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ TestHelpers.commonWidgetTests( "menu", {
"ui-menu-icons": "",
"ui-menu-icon": "",
"ui-menu-item": "",
"ui-menu-item-wrapper": "",
"ui-menu-divider": ""
},
disabled: false,
Expand Down
12 changes: 7 additions & 5 deletions ui/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ return $.widget( "ui.menu", {
"ui-menu-icons": "",
"ui-menu-icon": "",
"ui-menu-item": "",
"ui-menu-divider": ""
"ui-menu-divider": "",
"ui-menu-item-wrapper": ""
},
icons: {
submenu: "ui-icon-caret-1-e"
Expand Down Expand Up @@ -177,9 +178,9 @@ return $.widget( "ui.menu", {
.removeClass( this._classes( "ui-menu-item" ) )
.removeAttr( "role" )
.removeAttr( "aria-disabled" )
.children( ".ui-menu-item-wrapper" )
.find( ".ui-menu-item-wrapper" )
.removeUniqueId()
.removeClass( this._classes( "ui-menu-item-wrapper" ) + "ui-state-hover" )
.removeClass( this._classes( "ui-menu-item-wrapper" ) + " ui-state-hover" )
.removeAttr( "tabIndex" )
.removeAttr( "role" )
.removeAttr( "aria-haspopup" )
Expand Down Expand Up @@ -305,9 +306,9 @@ return $.widget( "ui.menu", {
.each(function() {
var menu = $( this ),
item = menu.prev(),
submenuCarat = $( "<span>" )
submenuCaret = $( "<span>" )
.addClass( that._classes( "ui-menu-icon" ) + " ui-icon " + icon )
.data( "ui-menu-submenu-carat", true );
.data( "ui-menu-submenu-caret", true );

item
.attr( "aria-haspopup", "true" )
Expand Down Expand Up @@ -363,6 +364,7 @@ return $.widget( "ui.menu", {
break;
case "ui-menu-icon":
case "ui-menu-item":
case "ui-menu-item-wrapper":
case "ui-menu-divider":
return this.element.find( classKey );
}
Expand Down