Release v0.13.0

Author: stevoland

Accordion.js

@@ -1,12 +1,10 @@
-/** @jsx React.DOM */
-
 var React = require('react');
 var PanelGroup = require('./PanelGroup');
 
 var Accordion = React.createClass({displayName: 'Accordion',
   render: function () {
-    return this.transferPropsTo(
-      PanelGroup( {accordion:true}, 
+    return (
+      React.createElement(PanelGroup, React.__spread({},  this.props, {accordion: true}), 
         this.props.children
       )
     );

Affix.js

@@ -1,6 +1,5 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var AffixMixin = require('./AffixMixin');
 var domUtils = require('./utils/domUtils');
 
@@ -13,8 +12,8 @@ var Affix = React.createClass({displayName: 'Affix',
 
   render: function () {
     var holderStyle = {top: this.state.affixPositionTop};
-    return this.transferPropsTo(
-      React.DOM.div( {className:this.state.affixClass, style:holderStyle}, 
+    return (
+      React.createElement("div", React.__spread({},  this.props, {className: joinClasses(this.props.className, this.state.affixClass), style: holderStyle}), 
         this.props.children
       )
     );

Alert.js

@@ -1,6 +1,5 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
 var BootstrapMixin = require('./BootstrapMixin');
 
@@ -22,12 +21,12 @@ var Alert = React.createClass({displayName: 'Alert',
 
   renderDismissButton: function () {
     return (
-      React.DOM.button(
-        {type:"button",
-        className:"close",
-        onClick:this.props.onDismiss,
-        'aria-hidden':"true"}, 
-        " × "
+      React.createElement("button", {
+        type: "button", 
+        className: "close", 
+        onClick: this.props.onDismiss, 
+        'aria-hidden': "true"}, 
+        "×"
       )
     );
   },
@@ -38,9 +37,9 @@ var Alert = React.createClass({displayName: 'Alert',
 
     classes['alert-dismissable'] = isDismissable;
 
-    return this.transferPropsTo(
-      React.DOM.div( {className:classSet(classes)}, 
-        isDismissable ? this.renderDismissButton() : null,
+    return (
+      React.createElement("div", React.__spread({},  this.props, {className: joinClasses(this.props.className, classSet(classes))}), 
+        isDismissable ? this.renderDismissButton() : null, 
         this.props.children
       )
     );

Badge.js

@@ -1,21 +1,23 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var ValidComponentChildren = require('./utils/ValidComponentChildren');
 var classSet = require('./utils/classSet');
 
 var Badge = React.createClass({displayName: 'Badge',
   propTypes: {
-    pullRight: React.PropTypes.bool,
+    pullRight: React.PropTypes.bool
   },
 
   render: function () {
     var classes = {
       'pull-right': this.props.pullRight,
-      'badge': ValidComponentChildren.hasValidComponent(this.props.children)
+      'badge': (ValidComponentChildren.hasValidComponent(this.props.children)
+        || (typeof this.props.children === 'string'))
     };
-    return this.transferPropsTo(
-      React.DOM.span( {className:classSet(classes)}, 
+    return (
+      React.createElement("span", React.__spread({}, 
+        this.props, 
+        {className: joinClasses(this.props.className, classSet(classes))}), 
         this.props.children
       )
     );

Button.js

@@ -1,9 +1,7 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
 var BootstrapMixin = require('./BootstrapMixin');
-var CustomPropTypes = require('./utils/CustomPropTypes');
 
 var Button = React.createClass({displayName: 'Button',
   mixins: [BootstrapMixin],
@@ -14,7 +12,7 @@ var Button = React.createClass({displayName: 'Button',
     block:    React.PropTypes.bool,
     navItem:    React.PropTypes.bool,
     navDropdown: React.PropTypes.bool,
-    componentClass: CustomPropTypes.componentClass
+    componentClass: React.PropTypes.node
   },
 
   getDefaultProps: function () {
@@ -43,26 +41,29 @@ var Button = React.createClass({displayName: 'Button',
   },
 
   renderAnchor: function (classes) {
-    var component = this.props.componentClass || React.DOM.a;
+
+    var Component = this.props.componentClass || 'a';
     var href = this.props.href || '#';
     classes['disabled'] = this.props.disabled;
 
-    return this.transferPropsTo(
-      component(
-        {href:href,
-        className:classSet(classes),
-        role:"button"}, 
+    return (
+      React.createElement(Component, React.__spread({}, 
+        this.props, 
+        {href: href, 
+        className: joinClasses(this.props.className, classSet(classes)), 
+        role: "button"}), 
         this.props.children
       )
     );
   },
 
   renderButton: function (classes) {
-    var component = this.props.componentClass || React.DOM.button;
+    var Component = this.props.componentClass || 'button';
 
-    return this.transferPropsTo(
-      component(
-        {className:classSet(classes)}, 
+    return (
+      React.createElement(Component, React.__spread({}, 
+        this.props, 
+        {className: joinClasses(this.props.className, classSet(classes))}), 
         this.props.children
       )
     );
@@ -74,7 +75,7 @@ var Button = React.createClass({displayName: 'Button',
     };
 
     return (
-      React.DOM.li( {className:classSet(liClasses)}, 
+      React.createElement("li", {className: classSet(liClasses)}, 
         this.renderAnchor(classes)
       )
     );

ButtonGroup.js

@@ -1,6 +1,5 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
 var BootstrapMixin = require('./BootstrapMixin');
 var Button = require('./Button');
@@ -25,9 +24,10 @@ var ButtonGroup = React.createClass({displayName: 'ButtonGroup',
     classes['btn-group-vertical'] = this.props.vertical;
     classes['btn-group-justified'] = this.props.justified;
 
-    return this.transferPropsTo(
-      React.DOM.div(
-        {className:classSet(classes)}, 
+    return (
+      React.createElement("div", React.__spread({}, 
+        this.props, 
+        {className: joinClasses(this.props.className, classSet(classes))}), 
         this.props.children
       )
     );

ButtonToolbar.js

@@ -1,6 +1,5 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
 var BootstrapMixin = require('./BootstrapMixin');
 var Button = require('./Button');
@@ -17,10 +16,11 @@ var ButtonToolbar = React.createClass({displayName: 'ButtonToolbar',
   render: function () {
     var classes = this.getBsClassSet();
 
-    return this.transferPropsTo(
-      React.DOM.div(
-        {role:"toolbar",
-        className:classSet(classes)}, 
+    return (
+      React.createElement("div", React.__spread({}, 
+        this.props, 
+        {role: "toolbar", 
+        className: joinClasses(this.props.className, classSet(classes))}), 
         this.props.children
       )
     );

Carousel.js

@@ -1,6 +1,5 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
 var cloneWithProps = require('./utils/cloneWithProps');
 var BootstrapMixin = require('./BootstrapMixin');
@@ -142,32 +141,33 @@ var Carousel = React.createClass({displayName: 'Carousel',
       slide: this.props.slide
     };
 
-    return this.transferPropsTo(
-      React.DOM.div(
-        {className:classSet(classes),
-        onMouseOver:this.handleMouseOver,
-        onMouseOut:this.handleMouseOut}, 
-        this.props.indicators ? this.renderIndicators() : null,
-        React.DOM.div( {className:"carousel-inner", ref:"inner"}, 
+    return (
+      React.createElement("div", React.__spread({}, 
+        this.props, 
+        {className: joinClasses(this.props.className, classSet(classes)), 
+        onMouseOver: this.handleMouseOver, 
+        onMouseOut: this.handleMouseOut}), 
+        this.props.indicators ? this.renderIndicators() : null, 
+        React.createElement("div", {className: "carousel-inner", ref: "inner"}, 
           ValidComponentChildren.map(this.props.children, this.renderItem)
-        ),
+        ), 
         this.props.controls ? this.renderControls() : null
       )
     );
   },
 
   renderPrev: function () {
     return (
-      React.DOM.a( {className:"left carousel-control", href:"#prev", key:0, onClick:this.prev}, 
-        React.DOM.span( {className:"glyphicon glyphicon-chevron-left"} )
+      React.createElement("a", {className: "left carousel-control", href: "#prev", key: 0, onClick: this.prev}, 
+        React.createElement("span", {className: "glyphicon glyphicon-chevron-left"})
       )
     );
   },
 
   renderNext: function () {
     return (
-      React.DOM.a( {className:"right carousel-control", href:"#next", key:1, onClick:this.next}, 
-        React.DOM.span( {className:"glyphicon glyphicon-chevron-right"})
+      React.createElement("a", {className: "right carousel-control", href: "#next", key: 1, onClick: this.next}, 
+        React.createElement("span", {className: "glyphicon glyphicon-chevron-right"})
       )
     );
   },
@@ -194,10 +194,10 @@ var Carousel = React.createClass({displayName: 'Carousel',
       'active' : null;
 
     return (
-      React.DOM.li(
-        {key:index,
-        className:className,
-        onClick:this.handleSelect.bind(this, index, null)} )
+      React.createElement("li", {
+        key: index, 
+        className: className, 
+        onClick: this.handleSelect.bind(this, index, null)})
     );
   },
 
@@ -215,7 +215,7 @@ var Carousel = React.createClass({displayName: 'Carousel',
       }, this);
 
     return (
-      React.DOM.ol( {className:"carousel-indicators"}, 
+      React.createElement("ol", {className: "carousel-indicators"}, 
         indicators
       )
     );
@@ -248,9 +248,8 @@ var Carousel = React.createClass({displayName: 'Carousel',
         child,
         {
           active: isActive,
-          ref: child.props.ref,
-          key: child.props.key != null ?
-            child.props.key : index,
+          ref: child.ref,
+          key: child.key ? child.key : index,
           index: index,
           animateOut: isPreviousActive,
           animateIn: isActive && this.state.previousActiveIndex != null && this.props.slide,

CarouselItem.js

@@ -1,6 +1,5 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
 var TransitionEvents = require('./utils/TransitionEvents');
 
@@ -9,7 +8,7 @@ var CarouselItem = React.createClass({displayName: 'CarouselItem',
     direction: React.PropTypes.oneOf(['prev', 'next']),
     onAnimateOutEnd: React.PropTypes.func,
     active: React.PropTypes.bool,
-    caption: React.PropTypes.renderable
+    caption: React.PropTypes.node
   },
 
   getInitialState: function () {
@@ -74,17 +73,17 @@ var CarouselItem = React.createClass({displayName: 'CarouselItem',
       classes[this.state.direction] = true;
     }
 
-    return this.transferPropsTo(
-      React.DOM.div( {className:classSet(classes)}, 
-        this.props.children,
+    return (
+      React.createElement("div", React.__spread({},  this.props, {className: joinClasses(this.props.className, classSet(classes))}), 
+        this.props.children, 
         this.props.caption ? this.renderCaption() : null
       )
     );
   },
 
   renderCaption: function () {
     return (
-      React.DOM.div( {className:"carousel-caption"}, 
+      React.createElement("div", {className: "carousel-caption"}, 
         this.props.caption
       )
     );

Col.js

@@ -1,8 +1,6 @@
-/** @jsx React.DOM */
-
 var React = require('react');
+var joinClasses = require('./utils/joinClasses');
 var classSet = require('./utils/classSet');
-var CustomPropTypes = require('./utils/CustomPropTypes');
 var constants = require('./constants');
 
 
@@ -24,17 +22,17 @@ var Col = React.createClass({displayName: 'Col',
     smPull: React.PropTypes.number,
     mdPull: React.PropTypes.number,
     lgPull: React.PropTypes.number,
-    componentClass: CustomPropTypes.componentClass.isRequired
+    componentClass: React.PropTypes.node.isRequired
   },
 
   getDefaultProps: function () {
     return {
-      componentClass: React.DOM.div
+      componentClass: 'div'
     };
   },
 
   render: function () {
-    var componentClass = this.props.componentClass;
+    var ComponentClass = this.props.componentClass;
     var classes = {};
 
     Object.keys(constants.SIZES).forEach(function (key) {
@@ -65,8 +63,8 @@ var Col = React.createClass({displayName: 'Col',
       }
     }, this);
 
-    return this.transferPropsTo(
-      componentClass( {className:classSet(classes)}, 
+    return (
+      React.createElement(ComponentClass, React.__spread({},  this.props, {className: joinClasses(this.props.className, classSet(classes))}), 
         this.props.children
       )
     );