themes fix + review fix + remove raw-code

mui · Dec 13, 2015 · 0efca26 · 0efca26
1 parent f18bcfa
commit 0efca26
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 62 deletions.
diff --git a/docs/src/app/components/pages/customization/themes.jsx b/docs/src/app/components/pages/customization/themes.jsx
@@ -476,12 +476,6 @@ const ThemesPage = React.createClass({
   },
 
   getComponentGroup() {
-    //Standard Actions
-    let standardActions = [
-      {text: 'Cancel'},
-      {text: 'Submit', onTouchTap: this._onDialogSubmit},
-    ];
-
     let styles = this.getStyles();
 
     let menuItems = [
@@ -576,7 +570,20 @@ const ThemesPage = React.createClass({
           <div style={styles.group}>
             <div style={styles.containerCentered}>
               <FlatButton label="View Dialog" onTouchTap={this.handleTouchTapDialog} />
-              <Dialog open={this.state.dialogOpen} title="Dialog With Standard Actions" actions={standardActions}
+              <Dialog
+                open={this.state.dialogOpen}
+                title="Dialog With Standard Actions"
+                actions={[
+                  <FlatButton
+                    label="Cancel"
+                    keyboardFocus={true}
+                    onTouchTap={this.handleRequestCloseDialog}
+                    secondary={true} />,
+                  <FlatButton
+                    label="Submit"
+                    onTouchTap={this.handleRequestCloseDialog}
+                    primary={true} />,
+                ]}
                 onRequestClose={this.handleRequestCloseDialog}>
                 The actions in this window are created from the json that&#39;s passed in.
               </Dialog>
@@ -675,9 +682,6 @@ const ThemesPage = React.createClass({
     });
   },
 
-  _onDialogSubmit() {
-    console.log('Submitting');
-  },
 });
 
 export default ThemesPage;
diff --git a/docs/src/app/components/raw-code/dialog-code.txt b/docs/src/app/components/raw-code/dialog-code.txt
diff --git a/src/dialog.jsx b/src/dialog.jsx
@@ -118,8 +118,8 @@ const DialogInline = React.createClass({
   propTypes: {
     actionFocus: React.PropTypes.string,
     actions: React.PropTypes.node,
-    actionsContainerClassName:  React.PropTypes.string,
-    actionsContainerStyle:  React.PropTypes.object,
+    actionsContainerClassName: React.PropTypes.string,
+    actionsContainerStyle: React.PropTypes.object,
     autoDetectWindowHeight: React.PropTypes.bool,
     autoScrollBodyContent: React.PropTypes.bool,
     bodyClassName: React.PropTypes.string,
@@ -473,12 +473,12 @@ const Dialog = React.createClass({
     /**
      * The `className` to add to the `Dialog` actions container's root element.
      */
-    actionsContainerClassName:  React.PropTypes.string,
+    actionsContainerClassName: React.PropTypes.string,
 
     /**
      * Overrides the inline-styles of the `Dialog` actions container's root element.
      */
-    actionsContainerStyle:  React.PropTypes.object,
+    actionsContainerStyle: React.PropTypes.object,
 
     /**
      * If set to true, the height of the `Dialog` will be auto detected. A max height
@@ -507,7 +507,7 @@ const Dialog = React.createClass({
     children: React.PropTypes.node,
 
     /**
-     * The `className` to add to the `Dialog` root element.
+     * The css class name of the root element.
      */
     className: React.PropTypes.string,
 
@@ -553,7 +553,7 @@ const Dialog = React.createClass({
     repositionOnUpdate: React.PropTypes.bool,
 
     /**
-     * Override the inline-styles of the `Dialog`'s root element.
+     * Override the inline-styles of the root element.
      */
     style: React.PropTypes.object,