Skip to content
Permalink
Browse files

Button: Added rtl detection so corner classes would properly be appli…

…ed to buttonsets. Fixed #6796. jQueryui - buttonset on rtl
  • Loading branch information...
dcneiner committed May 12, 2011
1 parent c89bbc1 commit 50a4186ef949ecaf7ab4977048160820587218d2
Showing with 18 additions and 2 deletions.
  1. +14 −0 tests/unit/button/button_core.js
  2. +4 −2 ui/jquery.ui.button.js
@@ -67,4 +67,18 @@ test("buttonset", function() {
ok( set.children("label:eq(2)").is(".ui-button.ui-corner-right:not(.ui-corner-all)") );
});

test("buttonset (rtl)", function() {
var parent = $("#radio1").parent();
// Set to rtl
parent.attr("dir", "rtl");

var set = $("#radio1").buttonset();
ok( set.is(".ui-buttonset") );
same( set.children(".ui-button").length, 3 );
same( set.children("input:radio.ui-helper-hidden-accessible").length, 3 );
ok( set.children("label:eq(0)").is(".ui-button.ui-corner-right:not(.ui-corner-all)") );
ok( set.children("label:eq(1)").is(".ui-button:not(.ui-corner-all)") );
ok( set.children("label:eq(2)").is(".ui-button.ui-corner-left:not(.ui-corner-all)") );
});

})(jQuery);
@@ -352,6 +352,8 @@ $.widget( "ui.buttonset", {
},

refresh: function() {
var ltr = this.element.css( "direction" ) === "ltr";

this.buttons = this.element.find( this.options.items )
.filter( ":ui-button" )
.button( "refresh" )
@@ -364,10 +366,10 @@ $.widget( "ui.buttonset", {
})
.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
.filter( ":first" )
.addClass( "ui-corner-left" )
.addClass( ltr ? "ui-corner-left" : "ui-corner-right" )
.end()
.filter( ":last" )
.addClass( "ui-corner-right" )
.addClass( ltr ? "ui-corner-right" : "ui-corner-left" )
.end()
.end();
},

0 comments on commit 50a4186

Please sign in to comment.
You can’t perform that action at this time.