Enabled icon position on Flat button

src/uiElements/buttons/components/flatButton.js

@@ -21,10 +21,26 @@ var FlatButton = React.createClass({
 
 	//Similar to the button className function, this takes in an icon prop. Make sure that the icon you pass in is
     //part of the linear icon pack.
-	getIcon: function() {
-		return (
-			<i className={' icon icon-' + this.props.icon} style={this.getStyle()}></i>
-		)
+	getLeftIcon: function() {
+		var iconPosition = this.props.iconPosition;
+
+		if (this.props.icon) {
+			if (iconPosition === "left" || !iconPosition) {
+				return (
+					<i className={' icon icon-' + this.props.icon} style={this.getStyle(iconPosition)}></i>
+				)
+			}
+		}
+	},
+
+	getRightIcon: function() {
+		var iconPosition = this.props.iconPosition;
+
+		if (this.props.icon && iconPosition === "right") {
+			return (
+				<i className={' icon icon-' + this.props.icon} style={this.getStyle(iconPosition)}></i>
+			);
+		}
 	},
 
 	getText: function() {
@@ -37,11 +53,17 @@ var FlatButton = React.createClass({
 		}
 	},
 
-	getStyle: function() {
+	getStyle: function(iconPosition) {
 		if (this.props.text && this.props.icon) {
-			return ({
-				marginRight: 5
-			})
+			if (iconPosition === "right") {
+				return ({
+					marginLeft: 5
+				})
+			} else {
+				return ({
+					marginRight: 5
+				});
+			}
 		}
 	},
 
@@ -60,8 +82,9 @@ var FlatButton = React.createClass({
 	render: function() {
 		return this.renderButton(
 			<button disabled={this.props.disabled} className={this.getButtonClassName()} onClick={this.props.onClick}>
-				{this.getIcon()}
-				{this.getText()}				
+				{this.getLeftIcon()}
+				{this.getText()}
+				{this.getRightIcon()}			
 			</button>
 		);
 	}

src/uiElements/buttons/examples/index.js

@@ -132,17 +132,20 @@ var ButtonExamples = React.createClass({
 				text="Secondary flat" 
 				icon="star"
 				type="secondary"
+				iconPosition="right"
 				onClick={this.onClick}
 			/>,
 			<FlatButton
 				text="Primary flat" 
 				icon="star"
 				type="primary"
+				iconPosition="left"
 				onClick={this.onClick}
 			/>,
 			<FlatButton
 				text="Plain flat" 
 				icon="star"
+				iconPosition="right"
 				onClick={this.onClick}
 			/>,
 		]