Merge pull request #257 from dcneiner/buttonset-rtl

Fixed #6796
jquery · May 13, 2011 · 523790b · 523790b
2 parents 7e2a704 + 50a4186
commit 523790b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/tests/unit/button/button_core.js b/tests/unit/button/button_core.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);
diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js
@@ -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();
 	},