Remove bsStyle support on Modal

cymen · cymen · commit 379ea3ecbcf0 · 2015-05-07T08:18:15.000-07:00
diff --git a/docs/examples/ModalContained.js b/docs/examples/ModalContained.js
@@ -12,7 +12,7 @@
 const ContainedModal = React.createClass({
   render() {
     return (
-      <Modal {...this.props} bsStyle='primary' title='Contained Modal' animation>
+      <Modal {...this.props} title='Contained Modal' animation>
         <div className='modal-body'>
           Elit est explicabo ipsum eaque dolorem blanditiis doloribus sed id ipsam, beatae, rem fuga id earum? Inventore et facilis obcaecati.
         </div>
diff --git a/docs/examples/ModalOverlayMixin.js b/docs/examples/ModalOverlayMixin.js
@@ -28,7 +28,7 @@ const CustomModalTrigger = React.createClass({
     }
 
     return (
-      <Modal bsStyle='primary' title='Modal heading' onRequestHide={this.handleToggle}>
+      <Modal title='Modal heading' onRequestHide={this.handleToggle}>
         <div className='modal-body'>
           This modal is controlled by our custom trigger component.
         </div>
diff --git a/docs/examples/ModalStatic.js b/docs/examples/ModalStatic.js
@@ -5,7 +5,6 @@ function handleHide() {
 const modalInstance = (
   <div className='static-modal'>
     <Modal title='Modal title'
-      bsStyle='primary'
       backdrop={false}
       animation={false}
       container={mountNode}
diff --git a/docs/examples/ModalTrigger.js b/docs/examples/ModalTrigger.js
@@ -1,7 +1,7 @@
 const MyModal = React.createClass({
   render() {
     return (
-      <Modal {...this.props} bsStyle='primary' title='Modal heading' animation={false}>
+      <Modal {...this.props} title='Modal heading' animation={false}>
         <div className='modal-body'>
           <h4>Text in a modal</h4>
           <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
diff --git a/src/Modal.js b/src/Modal.js
@@ -95,23 +95,8 @@ const Modal = React.createClass({
         );
     }
 
-    let bsStyle = this.props.bsStyle;
-    let classes = {
-      'modal-header': true
-    };
-    classes['bg-' + bsStyle] = bsStyle;
-    classes['text-' + bsStyle] = bsStyle;
-
-    let className = classNames(classes);
-
-    let style = {};
-    if (this.props.bsStyle) {
-      style.borderTopLeftRadius = 'inherit';
-      style.borderTopRightRadius = 'inherit';
-    }
-
     return (
-      <div className={className} style={style}>
+      <div className="modal-header">
         {closeButton}
         {this.renderTitle()}
       </div>
diff --git a/test/ModalSpec.js b/test/ModalSpec.js
@@ -85,17 +85,4 @@ describe('Modal', function () {
     assert.ok(dialog.className.match(/\bmodal-sm\b/));
   });
 
-  it('Should pass bsStyle to the header', function () {
-    let noOp = function () {};
-    let instance = ReactTestUtils.renderIntoDocument(
-      <Modal bsStyle='danger' title="Title" onRequestHide={noOp}>
-        <strong>Message</strong>
-      </Modal>
-    );
-
-    let header = instance.getDOMNode().getElementsByClassName('modal-header')[0];
-    assert.ok(header.className.match(/\bbg-danger\b/));
-    assert.ok(header.className.match(/\btext-danger\b/));
-  });
-
 });

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ const CustomModalTrigger = React.createClass({`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`return (`
`31`		`- <Modal bsStyle='primary' title='Modal heading' onRequestHide={this.handleToggle}>`
	`31`	`+ <Modal title='Modal heading' onRequestHide={this.handleToggle}>`
`32`	`32`	`<div className='modal-body'>`
`33`	`33`	`This modal is controlled by our custom trigger component.`
`34`	`34`	`</div>`