Skip to content

Commit eae496e

Browse files
ldelucaarschmitz
authored andcommitted
Theme: Carat should be named caret
Fixes #10683 Closes gh-1382
1 parent 2ff5dd0 commit eae496e

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

tests/unit/menu/menu_common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ TestHelpers.commonWidgetTests( "menu", {
22
defaults: {
33
disabled: false,
44
icons: {
5-
submenu: "ui-icon-carat-1-e"
5+
submenu: "ui-icon-caret-1-e"
66
},
77
items: "> *",
88
menus: "ul",

tests/unit/menu/menu_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ test( "{ disabled: false }", function() {
4343
test( "{ icons: default }", function() {
4444
expect( 2 );
4545
var element = $( "#menu2" ).menu();
46-
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" );
46+
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-caret-1-e" );
4747

4848
element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
4949
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-triangle-1-e" );

tests/unit/spinner/spinner_options.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ test( "icons: default ", function() {
1111
equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-triangle-1-s" );
1212

1313
element.spinner( "option", "icons", {
14-
up: "ui-icon-carat-1-n",
15-
down: "ui-icon-carat-1-s"
14+
up: "ui-icon-caret-1-n",
15+
down: "ui-icon-caret-1-s"
1616
});
17-
equal( element.spinner( "widget" ).find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-carat-1-n" );
18-
equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-carat-1-s" );
17+
equal( element.spinner( "widget" ).find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-caret-1-n" );
18+
equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-caret-1-s" );
1919
});
2020

2121
test( "icons: custom ", function() {

tests/visual/menu/menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
$( "#menu6" ).menu({
3636
menus: ".menuElement",
3737
select: logger,
38-
icon: "ui-icon-carat-1-s"
38+
icon: "ui-icon-caret-1-s"
3939
});
4040

4141
$( "#menu7" ).menu({

themes/base/theme.css

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,16 @@
188188

189189
/* positioning */
190190
.ui-icon-blank { background-position: 16px 16px; }
191-
.ui-icon-carat-1-n { background-position: 0 0; }
192-
.ui-icon-carat-1-ne { background-position: -16px 0; }
193-
.ui-icon-carat-1-e { background-position: -32px 0; }
194-
.ui-icon-carat-1-se { background-position: -48px 0; }
195-
.ui-icon-carat-1-s { background-position: -64px 0; }
196-
.ui-icon-carat-1-sw { background-position: -80px 0; }
197-
.ui-icon-carat-1-w { background-position: -96px 0; }
198-
.ui-icon-carat-1-nw { background-position: -112px 0; }
199-
.ui-icon-carat-2-n-s { background-position: -128px 0; }
200-
.ui-icon-carat-2-e-w { background-position: -144px 0; }
191+
.ui-icon-caret-1-n { background-position: 0 0; }
192+
.ui-icon-caret-1-ne { background-position: -16px 0; }
193+
.ui-icon-caret-1-e { background-position: -32px 0; }
194+
.ui-icon-caret-1-se { background-position: -48px 0; }
195+
.ui-icon-caret-1-s { background-position: -64px 0; }
196+
.ui-icon-caret-1-sw { background-position: -80px 0; }
197+
.ui-icon-caret-1-w { background-position: -96px 0; }
198+
.ui-icon-caret-1-nw { background-position: -112px 0; }
199+
.ui-icon-caret-2-n-s { background-position: -128px 0; }
200+
.ui-icon-caret-2-e-w { background-position: -144px 0; }
201201
.ui-icon-triangle-1-n { background-position: 0 -16px; }
202202
.ui-icon-triangle-1-ne { background-position: -16px -16px; }
203203
.ui-icon-triangle-1-e { background-position: -32px -16px; }

ui/menu.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ return $.widget( "ui.menu", {
3131
delay: 300,
3232
options: {
3333
icons: {
34-
submenu: "ui-icon-carat-1-e"
34+
submenu: "ui-icon-caret-1-e"
3535
},
3636
items: "> *",
3737
menus: "ul",
@@ -178,7 +178,7 @@ return $.widget( "ui.menu", {
178178
.removeAttr( "aria-haspopup" )
179179
.children().each(function() {
180180
var elem = $( this );
181-
if ( elem.data( "ui-menu-submenu-carat" ) ) {
181+
if ( elem.data( "ui-menu-submenu-caret" ) ) {
182182
elem.remove();
183183
}
184184
});
@@ -297,13 +297,13 @@ return $.widget( "ui.menu", {
297297
.each(function() {
298298
var menu = $( this ),
299299
item = menu.prev(),
300-
submenuCarat = $( "<span>" )
300+
submenuCaret = $( "<span>" )
301301
.addClass( "ui-menu-icon ui-icon " + icon )
302-
.data( "ui-menu-submenu-carat", true );
302+
.data( "ui-menu-submenu-caret", true );
303303

304304
item
305305
.attr( "aria-haspopup", "true" )
306-
.prepend( submenuCarat );
306+
.prepend( submenuCaret );
307307
menu.attr( "aria-labelledby", item.attr( "id" ) );
308308
});
309309

@@ -438,7 +438,7 @@ return $.widget( "ui.menu", {
438438
clearTimeout( this.timer );
439439

440440
// Don't open if already open fixes a Firefox bug that caused a .5 pixel
441-
// shift in the submenu position when mousing over the carat icon
441+
// shift in the submenu position when mousing over the caret icon
442442
if ( submenu.attr( "aria-hidden" ) !== "true" ) {
443443
return;
444444
}

0 commit comments

Comments
 (0)