Merge remote-tracking branch 'upstream/master'

examples/js/column-format/extra-data-column-format-table.js

@@ -9,11 +9,11 @@ var qualityType = {
     0: "good",
     1: "bad",
     2: "unknown"
-}
+};
 var inStockStatus = {
     1: "yes",
     2: "no"
-}
+};
 
 function addProducts(quantity) {
     var startId = products.length;
@@ -34,25 +34,15 @@ function enumFormatter(cell, row, enumObject){
     return enumObject[cell];
 }
 
-var cellEditProp = {
-    mode: "click",
-    blurToSave: true
-};
-
 export default class ExtraDataColumnFormatTable extends React.Component{
     render(){
-        var optionValues = [];
-        $.map(inStockStatus, function(value, index) {
-            optionValues.push(index);
-        });
-
         return (
-            <BootstrapTable data={products} cellEdit={cellEditProp} insertRow={true}>
+            <BootstrapTable data={products} >
                 <TableHeaderColumn dataField="id" isKey={true}>Product ID</TableHeaderColumn>
                 <TableHeaderColumn dataField="name">Product Name</TableHeaderColumn>
                 <TableHeaderColumn dataField="quality" dataFormat={enumFormatter} formatExtraData={qualityType}>Product Quality</TableHeaderColumn>
                 <TableHeaderColumn dataField="inStock" dataFormat={enumFormatter} formatExtraData={inStockStatus}>Product Stock Status</TableHeaderColumn>
             </BootstrapTable>
         );
     }
-};
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-bootstrap-table",
   "version": "1.5.0",
-  "description": "It' a react table for bootstrap",
+  "description": "It's a react table for bootstrap",
   "main": "./dist/react-bootstrap-table.min.js",
   "repository": {
     "type": "git",

src/BootstrapTable.js

@@ -64,7 +64,7 @@ class BootstrapTable extends React.Component {
 
     if (keyField == null)
       throw "Error. No any key column defined in TableHeaderColumn."+
-            "Use 'isKey={true}' to specify an unique column after version 0.5.4.";
+            "Use 'isKey={true}' to specify a unique column after version 0.5.4.";
 
     this.store.setProps({
       isPagination: props.pagination,

src/TableColumn.js

@@ -20,7 +20,7 @@ class TableColumn extends React.Component{
       return shouldUpdated;
     }
 
-    if(typeof children === 'object') {
+    if(typeof children === 'object' && children !== null) {
       if(children.props.type === 'checkbox' || children.props.type === 'radio') {
         shouldUpdated = shouldUpdated ||
           children.props.type !== nextProps.children.props.type ||