Merge pull request #474 from oliviertassinari/node

Dialog title: node instead of string

Author: mmrtnz

docs/src/app/components/pages/components/dialog.jsx

@@ -9,7 +9,7 @@ var DialogPage = React.createClass({
 
   render: function() {
 
-    var code = 
+    var code =
       '//Standard Actions\n' +
       'var standardActions = [\n' +
       '  { text: \'Cancel\' },\n' +
@@ -57,9 +57,9 @@ var DialogPage = React.createClass({
           },
           {
             name: 'title',
-            type: 'string',
+            type: 'node',
             header: 'optional',
-            desc: 'The title string to display on the dialog.'
+            desc: 'The title to display on the dialog. Could be number, string, element or an array containing these types.'
           }
         ]
       },
@@ -160,4 +160,4 @@ var DialogPage = React.createClass({
 
 });
 
-module.exports = DialogPage;
+module.exports = DialogPage;

src/js/dialog.jsx

@@ -7,28 +7,36 @@ var Dialog = React.createClass({
   mixins: [Classable],
 
   propTypes: {
-    title: React.PropTypes.string
+    title: React.PropTypes.node
   },
 
   render: function() {
     var {
       className,
-      title,
       ...other
     } = this.props;
     var classes = this.getClasses('mui-dialog');
+    var title;
+
+    if (this.props.title) {
+      // If the title is a string, wrap in an h3 tag.
+      // If not, just use it as a node.
+      title = toString.call(this.props.title) === '[object String]' ?
+        <h3 className="mui-dialog-title">{this.props.title}</h3> :
+        this.props.title;
+    }
 
     return (
       <DialogWindow
         {...other}
         ref="dialogWindow"
         className={classes}>
 
-        <h3 className="mui-dialog-title">{this.props.title}</h3>
+        {title}
         <div ref="dialogContent" className="mui-dialog-content">
           {this.props.children}
         </div>
-        
+
       </DialogWindow>
     );
   },
@@ -43,4 +51,4 @@ var Dialog = React.createClass({
 
 });
 
-module.exports = Dialog;
+module.exports = Dialog;