Merge pull request #2372 from chrismcv/dialog-fix

[Dialog] Fix key warnings when not using json action
mui · Dec 5, 2015 · 615a6b8 · 615a6b8
2 parents e1f71e5 + b1d8bda
commit 615a6b8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/dialog.jsx b/src/dialog.jsx
@@ -265,9 +265,8 @@ const DialogInline = React.createClass({
     );
   },
 
-  _getAction(actionJSON, key) {
+  _getAction(actionJSON) {
     let props = {
-      key: key,
       secondary: true,
       onClick: actionJSON.onClick,
       onTouchTap: () => {
@@ -315,15 +314,15 @@ const DialogInline = React.createClass({
 
         //if the current action isn't a react object, create one
         if (!React.isValidElement(currentAction)) {
-          currentAction = this._getAction(currentAction, i);
+          currentAction = this._getAction(currentAction);
         }
 
         actionObjects.push(currentAction);
       }
 
       actionContainer = (
         <div style={this.prepareStyles(actionStyle)}>
-          {actionObjects}
+          {React.Children.toArray(actionObjects)}
         </div>
       );
     }