Merge pull request #500 from grmlin/patch-1

overwriting props will create console warnings. Fixes #547
mui · Apr 17, 2015 · dab5b46 · dab5b46
2 parents c6967d1 + 93ce4ba
commit dab5b46
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/js/dialog-window.jsx b/src/js/dialog-window.jsx
@@ -96,9 +96,9 @@ var DialogWindow = React.createClass({
 
   _addClassName: function(reactObject, className) {
     var originalClassName = reactObject.props.className;
+    var newClassname = originalClassName ? originalClassName + ' ' + className : className;
 
-    reactObject.props.className = originalClassName ?
-      originalClassName + ' ' + className : className;
+    return React.cloneElement(reactObject, { className: newClassname });
   },
 
   _getAction: function(actionJSON, key) {
@@ -118,14 +118,14 @@ var DialogWindow = React.createClass({
 
     if (actions.length) {
       for (var i = 0; i < actions.length; i++) {
-        currentAction = actions[i];
+        var currentAction = actions[i];
 
         //if the current action isn't a react object, create one
         if (!React.isValidElement(currentAction)) {
           currentAction = this._getAction(currentAction, i);
         }
 
-        this._addClassName(currentAction, 'mui-dialog-window-action');
+        currentAction = this._addClassName(currentAction, 'mui-dialog-window-action');
         actionObjects.push(currentAction);
       };