fix typos, and remove comments

Author: jquense

src/Collapse.js

@@ -1,5 +1,3 @@
-/*eslint-disable react/prop-types */
-'use strict';
 import React from 'react';
 import Transition from './Transition';
 import domUtils from './utils/domUtils';
@@ -122,7 +120,7 @@ Collapse.propTypes = {
   in:       React.PropTypes.bool,
 
   /**
-   * Provide the durration of the animation in milliseconds, used to ensure that finishing callbacks are fired even if the
+   * Provide the duration of the animation in milliseconds, used to ensure that finishing callbacks are fired even if the
    * original browser transition end events are canceled.
    */
   duration:          React.PropTypes.number,
@@ -140,7 +138,7 @@ Collapse.propTypes = {
 
   /**
    * A function that returns the height or width of the animating DOM node. Allows for providing some custom logic how much
-   * Collapse component should animation in its specified dimension.
+   * Collapse component should animate in its specified dimension.
    *
    * `getDimensionValue` is called with the current dimension prop value and the DOM node.
    */

src/CollapsibleMixin.js

@@ -1,5 +1,8 @@
 import React from 'react';
 import TransitionEvents from './utils/TransitionEvents';
+import deprecationWarning from './utils/deprecationWarning';
+
+let warned = false;
 
 const CollapsibleMixin = {
 
@@ -21,6 +24,13 @@ const CollapsibleMixin = {
     };
   },
 
+  componentWillMount(){
+    if ( !warned ){
+      deprecationWarning('CollapsibleMixin', 'Collapse Component');
+      warned = true;
+    }
+  },
+
   componentWillUpdate(nextProps, nextState){
     let willExpanded = nextProps.expanded != null ? nextProps.expanded : nextState.expanded;
     if (willExpanded === this.isExpanded()) {

src/CollapsibleNav.js

@@ -19,25 +19,6 @@ const CollapsibleNav = React.createClass({
   },
 
 
-  // getCollapsibleDimensionValue() {
-  //   let height = 0;
-  //   let nodes = this.refs;
-  //   for (let key in nodes) {
-  //     if (nodes.hasOwnProperty(key)) {
-
-  //       let n = React.findDOMNode(nodes[key]);
-  //       let h = n.offsetHeight;
-  //       let computedStyles = domUtils.getComputedStyles(n);
-
-  //       height += (h +
-  //         parseInt(computedStyles.marginTop, 10) +
-  //         parseInt(computedStyles.marginBottom, 10)
-  //       );
-  //     }
-  //   }
-  //   return height;
-  // },
-
   render() {
     /*
      * this.props.collapsible is set in NavBar when an eventKey is supplied.

src/Fade.js

@@ -1,4 +1,3 @@
-'use strict';
 import React from 'react';
 import Transition from './Transition';
 
@@ -30,7 +29,7 @@ Fade.propTypes = {
   in:       React.PropTypes.bool,
 
   /**
-   * Provide the durration of the animation in milliseconds, used to ensure that finishing callbacks are fired even if the
+   * Provide the duration of the animation in milliseconds, used to ensure that finishing callbacks are fired even if the
    * original browser transition end events are canceled.
    */
   duration:          React.PropTypes.number,

src/FadeMixin.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import domUtils from './utils/domUtils';
+import deprecationWarning from './utils/deprecationWarning';
 
 // TODO: listen for onTransitionEnd to remove el
 function getElementsAndSelf (root, classes){
@@ -16,7 +17,16 @@ function getElementsAndSelf (root, classes){
   return els;
 }
 
+let warned = false;
+
 export default {
+  componentWillMount(){
+    if ( !warned ){
+      deprecationWarning('FadeMixin', 'Fade Component');
+      warned = true;
+    }
+  },
+
   _fadeIn() {
     let els;
 

src/Modal.js

@@ -96,11 +96,7 @@ function getScrollbarSize(){
 
 const ModalMarkup = React.createClass({
 
-<<<<<<< HEAD
-  mixins: [ BootstrapMixin, FadeMixin ],
-=======
   mixins: [ BootstrapMixin ],
->>>>>>> [added] Fade Component, replaces FadeMixin
 
   propTypes: {
 

src/Position.js

@@ -65,10 +65,6 @@ class Position extends React.Component {
     let target = React.findDOMNode(this.props.target(this.props));
     let container = React.findDOMNode(this.props.container) || domUtils.ownerDocument(this).body;
 
-    // if ( !overlay || !target || !container ){
-    //   return;
-    // }
-
     this.setState(
       calcOverlayPosition(
           this.props.placement

src/Transition.js

@@ -1,4 +1,3 @@
-'use strict';
 import React from 'react';
 import TransitionEvents from './utils/TransitionEvents';
 import classnames from 'classnames';
@@ -163,8 +162,8 @@ class Transition extends React.Component {
 
     let classes = '';
 
-    // for whatever reason classnames() doesn't actually work here,
-    // maybe because they aren't always single classes?
+    // using `classnames()` here causes a subtle bug,
+    // hence the verbose if/else if sequence.
     if (this.state.in && !this.state.transitioning) {
       classes = this.props.enteredClassName;
     }
@@ -184,9 +183,9 @@ class Transition extends React.Component {
     return React.cloneElement(child, {
       ...childProps,
       className: classnames(
-          child.props.className
-        , this.props.className
-        , classes)
+        child.props.className,
+        this.props.className,
+        classes)
     });
   }
 }
@@ -208,7 +207,7 @@ Transition.propTypes = {
   transitionAppear: React.PropTypes.bool,
 
   /**
-   * Provide the durration of the animation in milliseconds, used to ensure that finishing callbacks are fired even if the
+   * Provide the duration of the animation in milliseconds, used to ensure that finishing callbacks are fired even if the
    * original browser transition end events are canceled.
    */
   duration:          React.PropTypes.number,

test/CollapsibleMixinSpec.js

@@ -32,6 +32,12 @@ describe('CollapsibleMixin', function () {
     });
   });
 
+  afterEach(()=> {
+    if (console.warn.calledWithMatch('CollapsibleMixin is deprecated')){
+      console.warn.reset();
+    }
+  });
+
   describe('getInitialState', function(){
     it('Should check defaultExpanded', function () {
       instance = ReactTestUtils.renderIntoDocument(

test/FadeMixinSpec.js

@@ -19,6 +19,13 @@ describe('FadeMixin', function () {
     });
   });
 
+  afterEach(()=> {
+    if (console.warn.calledWithMatch('FadeMixin is deprecated')){
+      console.warn.reset();
+    }
+  });
+
+
   it('Should add the in class to all elements', function (done) {
     let instance = ReactTestUtils.renderIntoDocument(<Component />);