Theme: Carat should be named caret

Fixes #10683
Closes gh-1382

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 2404ebe020164b617bccdadbcf217b1fa030af85..ae0ab9887855d8a0c03b94579ed6e95cc51b9827 100644 (file)
--- a/tests/unit/menu/menu_common.js
+++ b/tests/unit/menu/menu_common.js
@@ -2,7 +2,7 @@ TestHelpers.commonWidgetTests( "menu", {
        defaults: {
                disabled: false,
                icons: {
-                       submenu: "ui-icon-carat-1-e"
+                       submenu: "ui-icon-caret-1-e"
                },
                items: "> *",
                menus: "ul",

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 438b02a32b8d3c4981121dfebc0f80e41b87e1bf..3b71037e8d212ec0d9312a91ee934ffc4d03f2a5 100644 (file)
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -43,7 +43,7 @@ test( "{ disabled: false }", function() {
 test( "{ icons: default }", function() {
        expect( 2 );
        var element = $( "#menu2" ).menu();
-       equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-carat-1-e" );
+       equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-caret-1-e" );
 
        element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
        equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-triangle-1-e" );

diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js
index 6f3650f923aab07896c295ada4d42cc40622315c..65bbd26024f2d9f79bf3cb8cec45010a44ebe044 100644 (file)
--- a/tests/unit/spinner/spinner_options.js
+++ b/tests/unit/spinner/spinner_options.js
@@ -11,11 +11,11 @@ test( "icons: default ", function() {
        equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-triangle-1-s" );
 
        element.spinner( "option", "icons", {
-               up: "ui-icon-carat-1-n",
-               down: "ui-icon-carat-1-s"
+               up: "ui-icon-caret-1-n",
+               down: "ui-icon-caret-1-s"
        });
-       equal( element.spinner( "widget" ).find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-carat-1-n" );
-       equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-carat-1-s" );
+       equal( element.spinner( "widget" ).find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-caret-1-n" );
+       equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-caret-1-s" );
 });
 
 test( "icons: custom ", function() {

diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html
index 855748d3d65bfd87eac7386733d1d981b4ac5410..c71f50ff4a43ca845583a7dc98885747d36a56e1 100644 (file)
--- a/tests/visual/menu/menu.html
+++ b/tests/visual/menu/menu.html
@@ -35,7 +35,7 @@
                $( "#menu6" ).menu({
                        menus: ".menuElement",
                        select: logger,
-                       icon: "ui-icon-carat-1-s"
+                       icon: "ui-icon-caret-1-s"
                });
 
                $( "#menu7" ).menu({

diff --git a/themes/base/theme.css b/themes/base/theme.css
index cda87011a611b40b625ebaf7a3cb5b82de389778..2aa74110243ea967c4c68ac4d600a31078c2e09c 100644 (file)
--- a/themes/base/theme.css
+++ b/themes/base/theme.css
@@ -188,16 +188,16 @@
 
 /* positioning */
 .ui-icon-blank { background-position: 16px 16px; }
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-caret-1-n { background-position: 0 0; }
+.ui-icon-caret-1-ne { background-position: -16px 0; }
+.ui-icon-caret-1-e { background-position: -32px 0; }
+.ui-icon-caret-1-se { background-position: -48px 0; }
+.ui-icon-caret-1-s { background-position: -64px 0; }
+.ui-icon-caret-1-sw { background-position: -80px 0; }
+.ui-icon-caret-1-w { background-position: -96px 0; }
+.ui-icon-caret-1-nw { background-position: -112px 0; }
+.ui-icon-caret-2-n-s { background-position: -128px 0; }
+.ui-icon-caret-2-e-w { background-position: -144px 0; }
 .ui-icon-triangle-1-n { background-position: 0 -16px; }
 .ui-icon-triangle-1-ne { background-position: -16px -16px; }
 .ui-icon-triangle-1-e { background-position: -32px -16px; }

diff --git a/ui/menu.js b/ui/menu.js
index b4909a11655c7ae552fbab37e8186880b726b07e..6d60e12a5bf17623bc33d4f98185fff7280a8b24 100644 (file)
--- a/ui/menu.js
+++ b/ui/menu.js
@@ -31,7 +31,7 @@ return $.widget( "ui.menu", {
        delay: 300,
        options: {
                icons: {
-                       submenu: "ui-icon-carat-1-e"
+                       submenu: "ui-icon-caret-1-e"
                },
                items: "> *",
                menus: "ul",
@@ -178,7 +178,7 @@ return $.widget( "ui.menu", {
                                .removeAttr( "aria-haspopup" )
                                .children().each(function() {
                                        var elem = $( this );
-                                       if ( elem.data( "ui-menu-submenu-carat" ) ) {
+                                       if ( elem.data( "ui-menu-submenu-caret" ) ) {
                                                elem.remove();
                                        }
                                });
@@ -297,13 +297,13 @@ return $.widget( "ui.menu", {
                        .each(function() {
                                var menu = $( this ),
                                        item = menu.prev(),
-                                       submenuCarat = $( "<span>" )
+                                       submenuCaret = $( "<span>" )
                                                .addClass( "ui-menu-icon ui-icon " + icon )
-                                               .data( "ui-menu-submenu-carat", true );
+                                               .data( "ui-menu-submenu-caret", true );
 
                                item
                                        .attr( "aria-haspopup", "true" )
-                                       .prepend( submenuCarat );
+                                       .prepend( submenuCaret );
                                menu.attr( "aria-labelledby", item.attr( "id" ) );
                        });
 
@@ -438,7 +438,7 @@ return $.widget( "ui.menu", {
                clearTimeout( this.timer );
 
                // Don't open if already open fixes a Firefox bug that caused a .5 pixel
-               // shift in the submenu position when mousing over the carat icon
+               // shift in the submenu position when mousing over the caret icon
                if ( submenu.attr( "aria-hidden" ) !== "true" ) {
                        return;
                }