Skip to content

Commit 4166580

Browse files
AllenFangAllenFang
committed
Merge pull request #89 from luqin/react-router
merge #89
2 parents 37b5c7e + 1b99151 commit 4166580

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+754
-843
lines changed

‎.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"stage": 0
3+
}

‎.eslintrc

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
2-
"extends": "airbnb",
3-
"globals": {
2+
"extends": "airbnb",
3+
"globals": {
44
"__DEV__": true
5-
},
6-
"rules": {
5+
},
6+
"rules": {
77
"react/jsx-quotes": 0,
8-
"jsx-quotes": [2, "prefer-double"]
9-
}
8+
"jsx-quotes": [
9+
2,
10+
"prefer-double"
11+
]
12+
}
1013
}

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
node_modules
22
.DS_Store
33
*~
4+
*.sublime-project
5+
*.sublime-workspace
6+
*.idea
7+
*.iml

‎.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
language: node_js
2+
node_js:
3+
- "0.12"
4+

‎README.md

+24-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# react-bootstrap-table
2-
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:
2+
3+
[![NPM version][npm-badge]][npm] [![Build Status][travis-ci-image]][travis-ci-url]
4+
5+
[![Dependency Status][deps-badge]][deps]
6+
[![devDependency Status][dev-deps-badge]][dev-deps]
7+
[![peerDependency Status][peer-deps-badge]][peer-deps]
8+
9+
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:
310

411
- column align
512
- column hidden
@@ -28,7 +35,7 @@ $ npm install
2835
Use gulp to build the react-bootstrap-table
2936
```
3037
$ gulp dev #for development
31-
$ gulp example-server #see all examples, go to localhost:3004/example-list.html
38+
$ gulp example-server #see all examples, go to localhost:3004
3239
$ gulp prod #for production
3340
```
3441

@@ -167,3 +174,18 @@ var dataSet = new TableDataSet(products);
167174
```
168175
dataSet.setData(newproducts);
169176
```
177+
178+
[npm-badge]: http://badge.fury.io/js/react-bootstrap-table.svg
179+
[npm]: http://badge.fury.io/js/react-bootstrap-table
180+
181+
[deps-badge]: https://david-dm.org/AllenFang/react-bootstrap-table.svg
182+
[deps]: https://david-dm.org/AllenFang/react-bootstrap-table
183+
184+
[dev-deps-badge]: https://david-dm.org/AllenFang/react-bootstrap-table/dev-status.svg
185+
[dev-deps]: https://david-dm.org/AllenFang/react-bootstrap-table#info=devDependencies
186+
187+
[peer-deps-badge]: https://david-dm.org/AllenFang/react-bootstrap-table/peer-status.svg
188+
[peer-deps]: https://david-dm.org/AllenFang/react-bootstrap-table#info=peerDependencies
189+
190+
[travis-ci-image]: https://travis-ci.org/AllenFang/react-bootstrap-table.svg
191+
[travis-ci-url]: https://travis-ci.org/AllenFang/react-bootstrap-table

‎examples/advance.html

-56
This file was deleted.

‎examples/basic.html

-43
This file was deleted.

‎examples/cell-edit.html

-61
This file was deleted.

‎examples/column-format.html

-34
This file was deleted.

‎examples/column.html

-43
This file was deleted.

‎examples/complex.html

-30
This file was deleted.

‎examples/example-list.html

-22
This file was deleted.

‎examples/index.html

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>react-bootstrap-table demo</title>
6+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
7+
<script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
8+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
9+
10+
</head>
11+
<body>
12+
<div id="root"></div>
13+
<script src="../vendors.js"></script>
14+
<script src="../app.bundle.js"></script>
15+
</body>
16+
</html>

‎examples/js/advance/auto-rowkey-table.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
'use strict';
21
import React from 'react';
32
import {BootstrapTable, TableHeaderColumn} from 'react-bootstrap-table';
43

0 commit comments

Comments
 (0)