merge #89 #71

AllenFang · Oct 22, 2015 · d2ff3b3 · d2ff3b3
2 parents f819786 + 4166580
commit d2ff3b3
Show file tree

Hide file tree

Showing 50 changed files with 806 additions and 993 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "stage": 0
+}
diff --git a/.eslintrc b/.eslintrc
@@ -1,10 +1,13 @@
 {
-    "extends": "airbnb",
-    "globals": {
+  "extends": "airbnb",
+  "globals": {
     "__DEV__": true
-},
-    "rules": {
+  },
+  "rules": {
     "react/jsx-quotes": 0,
-        "jsx-quotes": [2, "prefer-double"]
-}
+    "jsx-quotes": [
+      2,
+      "prefer-double"
+    ]
+  }
 }
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 node_modules
 .DS_Store
 *~
+*.sublime-project
+*.sublime-workspace
+*.idea
+*.iml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "0.12"
+
diff --git a/README.md b/README.md
@@ -1,5 +1,12 @@
 # react-bootstrap-table
-It's a react.js table for bootstrap, named reactbsTable. It's a configurable, functional table component and make you build a Bootstrap Table more efficiency and easy in your React application, However ```react-bootstrap-table``` support these features:
+
+[![NPM version][npm-badge]][npm] [![Build Status][travis-ci-image]][travis-ci-url]
+
+[![Dependency Status][deps-badge]][deps]
+[![devDependency Status][dev-deps-badge]][dev-deps]
+[![peerDependency Status][peer-deps-badge]][peer-deps]
+
+It's a [react.js](http://facebook.github.io/react/) table for bootstrap, named reactbsTable. It's a configurable, functional table component and make you build a Bootstrap Table more efficiency and easy in your React application, However ```react-bootstrap-table``` support these features:
 
 - column align
 - column hidden
@@ -28,7 +35,7 @@ $ npm install
 Use gulp to build the react-bootstrap-table
 ```
 $ gulp dev  #for development
-$ gulp example-server #see all examples, go to localhost:3004/example-list.html
+$ gulp example-server #see all examples, go to localhost:3004
 $ gulp prod #for production
 ```
 
@@ -167,3 +174,18 @@ var dataSet = new TableDataSet(products);
 ```
 dataSet.setData(newproducts);
 ```
+
+[npm-badge]: http://badge.fury.io/js/react-bootstrap-table.svg
+[npm]: http://badge.fury.io/js/react-bootstrap-table
+
+[deps-badge]: https://david-dm.org/AllenFang/react-bootstrap-table.svg
+[deps]: https://david-dm.org/AllenFang/react-bootstrap-table
+
+[dev-deps-badge]: https://david-dm.org/AllenFang/react-bootstrap-table/dev-status.svg
+[dev-deps]: https://david-dm.org/AllenFang/react-bootstrap-table#info=devDependencies
+
+[peer-deps-badge]: https://david-dm.org/AllenFang/react-bootstrap-table/peer-status.svg
+[peer-deps]: https://david-dm.org/AllenFang/react-bootstrap-table#info=peerDependencies 
+
+[travis-ci-image]: https://travis-ci.org/AllenFang/react-bootstrap-table.svg
+[travis-ci-url]: https://travis-ci.org/AllenFang/react-bootstrap-table
diff --git a/demo/js/demo.bundle.js b/demo/js/demo.bundle.js
diff --git a/dist/react-bootstrap-table.min.js b/dist/react-bootstrap-table.min.js
diff --git a/examples/advance.html b/examples/advance.html
diff --git a/examples/basic.html b/examples/basic.html
diff --git a/examples/cell-edit.html b/examples/cell-edit.html
diff --git a/examples/column-format.html b/examples/column-format.html
diff --git a/examples/column.html b/examples/column.html
diff --git a/examples/complex.html b/examples/complex.html
diff --git a/examples/example-list.html b/examples/example-list.html
diff --git a/examples/index.html b/examples/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>react-bootstrap-table demo</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+    <script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+
+</head>
+<body>
+    <div id="root"></div>
+    <script src="../vendors.js"></script>
+    <script src="../app.bundle.js"></script>
+</body>
+</html>
diff --git a/examples/js/advance/auto-rowkey-table.js b/examples/js/advance/auto-rowkey-table.js
@@ -1,4 +1,3 @@
-'use strict';
 import React from 'react';
 import {BootstrapTable, TableHeaderColumn} from 'react-bootstrap-table';