Button: Adding ui mirroring support

jquery · Mar 15, 2016 · 1946111329cac90ffb97f30437bdf160885df3a7 · 1946111
1 parent 8ba1210
commit 1946111329cac90ffb97f30437bdf160885df3a7
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 0 deletions.
diff --git a/demos/button/icons-rtl.html b/demos/button/icons-rtl.html
@@ -0,0 +1,65 @@
+<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>jQuery UI Button - Icons</title>
+	<link rel="stylesheet" href="../../themes/base/all.css">
+	<link rel="stylesheet" href="../demos.css">
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
+		$( ".widget button" )
+			.eq( 0 ).button()
+			.end().eq( 1 ).button( {
+				icon: "ui-icon-gear",
+				showLabel: false
+			} ).end().eq( 2 ).button( {
+				icon: "ui-icon-gear"
+			} ).end().eq( 3 ).button( {
+				icon: "ui-icon-gear",
+				iconPosition: "end"
+			} ).end().eq( 4 ).button( {
+				icon: "ui-icon-gear",
+				iconPosition: "top"
+			} ).end().eq( 5 ).button( {
+				icon: "ui-icon-gear",
+				iconPosition: "bottom"
+			} );
+	</script>
+</head>
+<body dir="rtl">
+<div class="widget">
+	<h1>Widget</h1>
+	<button>Button with only text</button>
+	<button>Button with icon only</button>
+	<button>Button with icon on the left</button>
+	<button>Button with icon on the right</button>
+	<button>Button with icon on the top</button>
+	<button>Button with icon on the bottom</button>
+</div>
+<div class="css">
+	<h1>CSS</h1>
+	<button class="ui-button ui-widget ui-corner-all">
+		Button with only text
+	</button>
+	<button class="ui-button ui-widget ui-corner-all ui-button-icon-only" title="Button with icon only">
+		<span class="ui-icon ui-icon-gear"></span> Button with icon only
+	</button>
+	<button class="ui-button ui-widget ui-corner-all">
+		<span class="ui-icon ui-icon-gear"></span> Button with icon on the left
+	</button>
+	<button class="ui-button ui-widget ui-corner-all">
+		Button with icon on the right <span class="ui-icon ui-icon-gear"></span>
+	</button>
+	<button class="ui-button ui-widget ui-corner-all">
+		<span class="ui-icon ui-icon-gear ui-rtl ui-widget-icon-block"></span> Button with icon on the top
+	</button>
+	<button class="ui-button ui-widget ui-corner-all">
+		Button with icon on the bottom <span class="ui-icon ui-icon-gear ui-rtl ui-widget-icon-block"></span>
+	</button>
+</div>
+<div class="demo-description">
+<p>Some buttons with various combinations of text and icons.</p>
+</div>
+</body>
+</html>
diff --git a/demos/button/index.html b/demos/button/index.html
@@ -10,6 +10,7 @@
 <ul>
 	<li><a href="default.html">Default functionality</a></li>
 	<li><a href="icons.html">Icons</a></li>
+	<li><a href="icons-rtl.html">Icons(rtl)</a></li>
 </ul>
 
 </body>

diff --git a/themes/base/core.css b/themes/base/core.css
@@ -95,3 +95,10 @@
 	width: 100%;
 	height: 100%;
 }
+/* Rtl support*/
+.ui-rtl.ui-widget-icon-block {
+	left: auto;
+	right: 50%;
+	margin-left: 0;
+	margin-right: -8px;
+}
diff --git a/ui/widgets/button.js b/ui/widgets/button.js
@@ -169,6 +169,9 @@ $.widget( "ui.button", {
 		// If the icon is on top or bottom we need to add the ui-widget-icon-block class and remove
 		// the iconSpace if there is one.
 		if ( displayBlock ) {
+			if ( this.isRtl() ) {
+				this._addClass( this.icon, null, "ui-rtl" );
+			}
 			this._addClass( this.icon, null, "ui-widget-icon-block" );
 			if ( this.iconSpace ) {
 				this.iconSpace.remove();