Skip to content

Commit 3d66232

Browse files
wenzhixinwenzhixin
committed
Update version to 1.4.0
1 parent f455c9e commit 3d66232

File tree

10 files changed

+172
-147
lines changed

10 files changed

+172
-147
lines changed

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
## ChangeLog
22

3+
### 1.4.0
4+
5+
- [enh] Fix #119, #123: Save all `id` and `class` of `tr` and `td` for html table.
6+
- [enh] Fix #149: Hide empty data on Card view.
7+
- [enh] Fix #131: Add `onPageChange` event.
8+
- [enh] Add `onSearch` event.
9+
- [enh] Apply `width` column option to row style.
10+
- [enh] Add bootstrap-table-filter extension.
11+
- [enh] Add cs-CZ, es-CR, es-NI, pl-PL, ur-PK, ko-KR, th-TH locales.
12+
- [bug] Fix `minimumCountColumns` option init error.
13+
- [bug] Fix #161: `undefined` or `null` string sort bug.
14+
- [bug] Fix #171: IE disabled button can be clicked bug.
15+
- [bug] Fix #185: Reset the page to the first page when changing the url with `refresh` method.
16+
- [bug] Fix #202: updateRow method keep the scroll position.
17+
- [enh] Add `smartDisplay` option.
18+
- [enh] Add `searchAlign` and `toolbarAlign` options.
19+
- [enh] Fix #193: Add `dataType` option.
20+
- [enh] Add flatJSON and editable extensions.
21+
- [enh] Add `rowAttributes` option.
22+
- [enh] Update documentation.
23+
324
### 1.3.0
425

526
- [enh] Take `showHeader` option effect to the card view.

‎CONTRIBUTORS.md‎

Lines changed: 109 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,140 +12,203 @@ bootstrap-table is due to the excellent work of the following contributors:
1212
</tr>
1313

1414
<tr>
15-
<td><img src="https://avatars.githubusercontent.com/u/2117018?v=2" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
15+
<td><img src="https://avatars.githubusercontent.com/u/2117018?v=3" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
1616
<td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
1717
<td>Guangzhou, China</td>
1818
<td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
19-
<td>439</td>
19+
<td>514</td>
2020
<tr>
2121
<tr>
22-
<td><img src="https://avatars.githubusercontent.com/u/8710090?v=2" width="32" height="32"> Joseph Reiter</td>
23-
<td><a href="https://github.com/thx2001r">thx2001r</a></td>
24-
<td>United States</td>
22+
<td><img src="https://avatars.githubusercontent.com/u/4496763?v=3" width="32" height="32"> <a href="mailto:dennishernandezvargas@gmail.com">Dennis Hernández</a></td>
23+
<td><a href="https://github.com/djhvscf">djhvscf</a></td>
24+
<td>Costa Rica</td>
25+
<td><a href="http://djhvscf.github.io/Blog/">http://djhvscf.github.io/Blog/</a></td>
26+
<td>11</td>
27+
<tr>
28+
<tr>
29+
<td><img src="https://avatars.githubusercontent.com/u/2921893?v=3" width="32" height="32"> <a href="mailto:ice50505050@hotmail.com">Kamonwat Sangudsub</a></td>
30+
<td><a href="https://github.com/ice5050">ice5050</a></td>
31+
<td>Chiang Mai, Thailand</td>
32+
<td><a href="http://www.kamonwat.ninja">http://www.kamonwat.ninja</a></td>
33+
<td>5</td>
34+
<tr>
35+
<tr>
36+
<td><img src="https://avatars.githubusercontent.com/u/2130852?v=3" width="32" height="32"> kula1922</td>
37+
<td><a href="https://github.com/kula1922">kula1922</a></td>
38+
<td></td>
2539
<td></td>
2640
<td>3</td>
2741
<tr>
2842
<tr>
29-
<td><img src="https://avatars.githubusercontent.com/u/6866443?v=2" width="32" height="32"> janborup</td>
43+
<td><img src="https://avatars.githubusercontent.com/u/6866443?v=3" width="32" height="32"> janborup</td>
3044
<td><a href="https://github.com/janborup">janborup</a></td>
3145
<td></td>
3246
<td></td>
3347
<td>3</td>
3448
<tr>
3549
<tr>
36-
<td><img src="https://avatars.githubusercontent.com/u/5487021?v=2" width="32" height="32"> Julien Bisconti</td>
50+
<td><img src="https://avatars.githubusercontent.com/u/8710090?v=3" width="32" height="32"> Joseph Reiter</td>
51+
<td><a href="https://github.com/thx2001r">thx2001r</a></td>
52+
<td>United States</td>
53+
<td></td>
54+
<td>3</td>
55+
<tr>
56+
<tr>
57+
<td><img src="https://avatars.githubusercontent.com/u/5487021?v=3" width="32" height="32"> Julien Bisconti</td>
3758
<td><a href="https://github.com/veggiemonk">veggiemonk</a></td>
3859
<td>Belgium</td>
3960
<td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
4061
<td>3</td>
4162
<tr>
4263
<tr>
43-
<td><img src="https://avatars.githubusercontent.com/u/5970450?v=2" width="32" height="32"> <a href="mailto:davide.renzi@gmail.com">Davide Renzi</a></td>
44-
<td><a href="https://github.com/didaxRedux">didaxRedux</a></td>
45-
<td>Rome, IT</td>
46-
<td><a href="http://www.pantomedia.it">http://www.pantomedia.it</a></td>
64+
<td><img src="https://avatars.githubusercontent.com/u/1710772?v=3" width="32" height="32"> cokert</td>
65+
<td><a href="https://github.com/cokert">cokert</a></td>
66+
<td></td>
67+
<td></td>
4768
<td>2</td>
4869
<tr>
4970
<tr>
50-
<td><img src="https://avatars.githubusercontent.com/u/775601?v=2" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
71+
<td><img src="https://avatars.githubusercontent.com/u/9211672?v=3" width="32" height="32"> Bert Hankes</td>
72+
<td><a href="https://github.com/BertHankes">BertHankes</a></td>
73+
<td>Utrecht</td>
74+
<td><a href="http://www.a2hankes.nl">http://www.a2hankes.nl</a></td>
75+
<td>2</td>
76+
<tr>
77+
<tr>
78+
<td><img src="https://avatars.githubusercontent.com/u/775601?v=3" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
5179
<td><a href="https://github.com/Muzical84">Muzical84</a></td>
5280
<td>Midwest</td>
5381
<td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
5482
<td>2</td>
5583
<tr>
5684
<tr>
57-
<td><img src="https://avatars.githubusercontent.com/u/59292?v=2" width="32" height="32"> nikolas</td>
58-
<td><a href="https://github.com/nikolas">nikolas</a></td>
85+
<td><img src="https://avatars.githubusercontent.com/u/8644915?v=3" width="32" height="32"> @mcspx</td>
86+
<td><a href="https://github.com/mcspx">mcspx</a></td>
5987
<td></td>
6088
<td></td>
6189
<td>2</td>
6290
<tr>
6391
<tr>
64-
<td><img src="https://avatars.githubusercontent.com/u/385731?v=2" width="32" height="32"> <a href="mailto:michael.schramm@gmail.com">Michael Schramm</a></td>
92+
<td><img src="https://avatars.githubusercontent.com/u/385731?v=3" width="32" height="32"> <a href="mailto:michael.schramm@gmail.com">Michael Schramm</a></td>
6593
<td><a href="https://github.com/wodka">wodka</a></td>
6694
<td>Vienna</td>
6795
<td></td>
6896
<td>2</td>
6997
<tr>
7098
<tr>
71-
<td><img src="https://avatars.githubusercontent.com/u/9211672?v=2" width="32" height="32"> Bert Hankes</td>
72-
<td><a href="https://github.com/BertHankes">BertHankes</a></td>
73-
<td>Utrecht</td>
74-
<td><a href="http://www.a2hankes.nl">http://www.a2hankes.nl</a></td>
99+
<td><img src="https://avatars.githubusercontent.com/u/8870312?v=3" width="32" height="32"> <a href="mailto:duc.pham@enclave.vn">Duc N. PHAM</a></td>
100+
<td><a href="https://github.com/ducnpham">ducnpham</a></td>
101+
<td></td>
102+
<td></td>
75103
<td>2</td>
76104
<tr>
77105
<tr>
78-
<td><img src="https://avatars.githubusercontent.com/u/8870312?v=2" width="32" height="32"> <a href="mailto:duc.pham@enclave.vn">Duc N. PHAM</a></td>
79-
<td><a href="https://github.com/ducnpham">ducnpham</a></td>
80-
<td></td>
106+
<td><img src="https://avatars.githubusercontent.com/u/5313150?v=3" width="32" height="32"> Dunaevsky Maxim</td>
107+
<td><a href="https://github.com/dunmaksim">dunmaksim</a></td>
108+
<td>Russia, Lipetsk</td>
81109
<td></td>
82110
<td>2</td>
83111
<tr>
84112
<tr>
85-
<td><img src="https://avatars.githubusercontent.com/u/1710772?v=2" width="32" height="32"> cokert</td>
86-
<td><a href="https://github.com/cokert">cokert</a></td>
113+
<td><img src="https://avatars.githubusercontent.com/u/59292?v=3" width="32" height="32"> nikolas</td>
114+
<td><a href="https://github.com/nikolas">nikolas</a></td>
87115
<td></td>
88116
<td></td>
89117
<td>2</td>
90118
<tr>
91119
<tr>
92-
<td><img src="https://avatars.githubusercontent.com/u/1369261?v=2" width="32" height="32"> Tomislav Simić</td>
93-
<td><a href="https://github.com/petougao">petougao</a></td>
94-
<td>Serbia, Europe</td>
95-
<td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
120+
<td><img src="https://avatars.githubusercontent.com/u/5970450?v=3" width="32" height="32"> <a href="mailto:davide.renzi@gmail.com">Davide Renzi</a></td>
121+
<td><a href="https://github.com/didaxRedux">didaxRedux</a></td>
122+
<td>Rome, IT</td>
123+
<td><a href="http://www.pantomedia.it">http://www.pantomedia.it</a></td>
124+
<td>2</td>
125+
<tr>
126+
<tr>
127+
<td><img src="https://avatars.githubusercontent.com/u/171167?v=3" width="32" height="32"> Michał Zagdan</td>
128+
<td><a href="https://github.com/zergu">zergu</a></td>
129+
<td></td>
130+
<td><a href="http://code42.pl/">http://code42.pl/</a></td>
96131
<td>1</td>
97132
<tr>
98133
<tr>
99-
<td><img src="https://avatars.githubusercontent.com/u/3691490?v=2" width="32" height="32"> Peter Dave Hello</td>
134+
<td><img src="https://avatars.githubusercontent.com/u/3691490?v=3" width="32" height="32"> Peter Dave Hello</td>
100135
<td><a href="https://github.com/PeterDaveHello">PeterDaveHello</a></td>
101136
<td>Taiwan ROC</td>
102137
<td><a href="https://www.peterdavehello.org/">https://www.peterdavehello.org/</a></td>
103138
<td>1</td>
104139
<tr>
105140
<tr>
106-
<td><img src="https://avatars.githubusercontent.com/u/5148536?v=2" width="32" height="32"> Emin Şen</td>
107-
<td><a href="https://github.com/emnsen">emnsen</a></td>
141+
<td><img src="https://avatars.githubusercontent.com/u/9149445?v=3" width="32" height="32"> gianndall</td>
142+
<td><a href="https://github.com/gianndall">gianndall</a></td>
108143
<td></td>
109144
<td></td>
110145
<td>1</td>
111146
<tr>
112147
<tr>
113-
<td><img src="https://avatars.githubusercontent.com/u/5313150?v=2" width="32" height="32"> Dunaevsky Maxim</td>
114-
<td><a href="https://github.com/dunmaksim">dunmaksim</a></td>
115-
<td>Russia, Lipetsk</td>
148+
<td><img src="https://avatars.githubusercontent.com/u/3030334?v=3" width="32" height="32"> himyouten</td>
149+
<td><a href="https://github.com/himyouten">himyouten</a></td>
150+
<td></td>
116151
<td></td>
117152
<td>1</td>
118153
<tr>
119154
<tr>
120-
<td><img src="https://avatars.githubusercontent.com/u/188236?v=2" width="32" height="32"> gnhaku</td>
121-
<td><a href="https://github.com/gnhaku">gnhaku</a></td>
122-
<td>Moscow, Russia</td>
123-
<td><a href="http://gnhaku.me">http://gnhaku.me</a></td>
155+
<td><img src="https://avatars.githubusercontent.com/u/3645565?v=3" width="32" height="32"> <a href="mailto:github@coyle.dk">Jan Borup Coyle</a></td>
156+
<td><a href="https://github.com/JanCoyle">JanCoyle</a></td>
157+
<td>Odense, Denmark</td>
158+
<td><a href="http://www.coyle.dk">http://www.coyle.dk</a></td>
124159
<td>1</td>
125160
<tr>
126161
<tr>
127-
<td><img src="https://avatars.githubusercontent.com/u/3030334?v=2" width="32" height="32"> himyouten</td>
128-
<td><a href="https://github.com/himyouten">himyouten</a></td>
162+
<td><img src="https://avatars.githubusercontent.com/u/61626?v=3" width="32" height="32"> <a href="mailto:srcnckr@gmail.com">Sercan Çakır</a></td>
163+
<td><a href="https://github.com/mayoz">mayoz</a></td>
164+
<td>Turkey</td>
165+
<td><a href="http://www.sercancakir.com">http://www.sercancakir.com</a></td>
166+
<td>1</td>
167+
<tr>
168+
<tr>
169+
<td><img src="https://avatars.githubusercontent.com/u/1542297?v=3" width="32" height="32"> <a href="mailto:mengyou658@163.com">mengyou</a></td>
170+
<td><a href="https://github.com/mengyou658">mengyou658</a></td>
129171
<td></td>
130172
<td></td>
131173
<td>1</td>
132174
<tr>
133175
<tr>
134-
<td><img src="https://avatars.githubusercontent.com/u/9149445?v=2" width="32" height="32"> gianndall</td>
135-
<td><a href="https://github.com/gianndall">gianndall</a></td>
176+
<td><img src="https://avatars.githubusercontent.com/u/5148536?v=3" width="32" height="32"> Emin Şen</td>
177+
<td><a href="https://github.com/emnsen">emnsen</a></td>
136178
<td></td>
137179
<td></td>
138180
<td>1</td>
139181
<tr>
140182
<tr>
141-
<td><img src="https://avatars.githubusercontent.com/u/1542297?v=2" width="32" height="32"> <a href="mailto:mengyou658@163.com">mengyou</a></td>
142-
<td><a href="https://github.com/mengyou658">mengyou658</a></td>
183+
<td><img src="https://avatars.githubusercontent.com/u/5407898?v=3" width="32" height="32"> Malik Rizwan</td>
184+
<td><a href="https://github.com/rams0b">rams0b</a></td>
185+
<td></td>
186+
<td></td>
187+
<td>1</td>
188+
<tr>
189+
<tr>
190+
<td><img src="https://avatars.githubusercontent.com/u/9339703?v=3" width="32" height="32"> JSON-OBJECT</td>
191+
<td><a href="https://github.com/JSON-OBJECT">JSON-OBJECT</a></td>
143192
<td></td>
144193
<td></td>
145194
<td>1</td>
146195
<tr>
147196
<tr>
148-
<td><img src="https://avatars.githubusercontent.com/u/1701102?v=2" width="32" height="32"> egcerqueira</td>
197+
<td><img src="https://avatars.githubusercontent.com/u/188236?v=3" width="32" height="32"> gnhaku</td>
198+
<td><a href="https://github.com/gnhaku">gnhaku</a></td>
199+
<td>Moscow, Russia</td>
200+
<td><a href="http://gnhaku.me">http://gnhaku.me</a></td>
201+
<td>1</td>
202+
<tr>
203+
<tr>
204+
<td><img src="https://avatars.githubusercontent.com/u/1369261?v=3" width="32" height="32"> Tomislav Simić</td>
205+
<td><a href="https://github.com/petougao">petougao</a></td>
206+
<td>Serbia, Europe</td>
207+
<td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
208+
<td>1</td>
209+
<tr>
210+
<tr>
211+
<td><img src="https://avatars.githubusercontent.com/u/1701102?v=3" width="32" height="32"> egcerqueira</td>
149212
<td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
150213
<td></td>
151214
<td></td>
@@ -154,4 +217,4 @@ bootstrap-table is due to the excellent work of the following contributors:
154217

155218
</table>
156219

157-
Update date: 2014-10-16, created with https://github.com/wenzhixin/github-contributors
220+
Update date: 2014-11-21, created with https://github.com/wenzhixin/github-contributors

‎Gruntfile.js‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = function(grunt) {
1313
'* Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n' +
1414
'*/\n',
1515
// Task configuration.
16-
clean: ['dist'],
16+
clean: ['dist', 'docs/dist'],
1717
uglify: {
1818
options: {
1919
banner: '<%= banner %>'
@@ -31,6 +31,15 @@ module.exports = function(grunt) {
3131
dest: 'dist/locale',
3232
ext: '.min.js' // replace .js to .min.js
3333
}]
34+
},
35+
extensions_target: {
36+
files: [{
37+
expand: true,
38+
cwd: 'src/extensions',
39+
src: '**/*.js',
40+
dest: 'dist/extensions',
41+
ext: '.min.js' // replace .js to .min.js
42+
}]
3443
}
3544
},
3645
cssmin: {
@@ -42,12 +51,21 @@ module.exports = function(grunt) {
4251
'dist/<%= pkg.name %>.min.css': ['src/<%=pkg.name %>.css']
4352
}
4453
}
54+
},
55+
copy: {
56+
files: {
57+
cwd: 'dist', // set working folder / root to copy
58+
src: '**/*', // copy all files and subfolders
59+
dest: 'docs/dist', // destination folder
60+
expand: true // required when using cwd
61+
}
4562
}
4663
});
4764

4865
grunt.loadNpmTasks('grunt-contrib-clean');
4966
grunt.loadNpmTasks('grunt-contrib-uglify');
5067
grunt.loadNpmTasks('grunt-contrib-cssmin');
68+
grunt.loadNpmTasks('grunt-contrib-copy');
5169

52-
grunt.registerTask('default', ['clean', 'uglify', 'cssmin']);
70+
grunt.registerTask('default', ['clean', 'uglify', 'cssmin', 'copy']);
5371
};

‎README.md‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,22 @@
1-
# bootstrap table
1+
# [Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn)
22

33
[![Build Status](https://travis-ci.org/wenzhixin/bootstrap-table.png)](https://travis-ci.org/wenzhixin/bootstrap-table)
44

5-
Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on. The table has been designed to reduce development time and to require no specific knowledge from developers. It is both featherweight and feature-rich.
5+
An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.
66

7-
* [Documentation](http://wenzhixin.net.cn/p/bootstrap-table/docs/documentation.html)
8-
* [Examples](http://wenzhixin.net.cn/p/bootstrap-table/docs/examples.html)
9-
* [JSFiddle Examples](docs/jsfiddle-examples.md)
10-
* [Extensions](http://wenzhixin.net.cn/p/bootstrap-table/docs/extensions.html)
11-
* [Resources](docs/resources.md)
7+
To get started, check out http://bootstrap-table.wenzhixin.net.cn!
128

139
## Latest release
1410

15-
1.3.0 (2014-10-16)
11+
1.4.0 (2014-11-21)
1612

1713
## LICENSE
1814

1915
**NOTE:** Bootstrap Table is licensed under the [The MIT License](https://github.com/wenzhixin/bootstrap-table/blob/master/LICENSE). Completely free, you can arbitrarily use and modify this plugin. If this plugin is useful to you, you can **Star** this repo, your support is my biggest motive force, thanks.
2016

2117
## Bugs & Enhancements (next version)
2218

23-
- [x] Fix #119, #123: Save all `id` and `class` of `tr` and `td` for html table.
24-
- [x] Fix #149: Hide empty data on Card view.
25-
- [x] Fix #131: Add `onPageChange` event.
26-
- [x] Add `onSearch` event.
2719
- [ ] Fix #144: `onCheck` and `onUncheck` method are reversed when using `clickToSelect` option. (jQuery 1.7.2 bug).
28-
- [x] Apply `width` column option to row style.
29-
- [x] Add bootstrap-table-filter extension.
30-
- [x] Add cs-CZ, es-CR, es-NI, pl-PL, ur-PK, ko-KR, th-TH locales.
31-
- [x] Fix `minimumCountColumns` option init error.
32-
- [x] Fix #161: `undefined` or `null` string sort bug.
33-
- [x] Fix #171: IE disabled button can be clicked bug.
34-
- [x] Fix #185: Reset the page to the first page when changing the url with `refresh` method.
35-
- [x] Fix #202: updateRow method keep the scroll position.
36-
- [x] Add `smartDisplay` option.
37-
- [x] Add `searchAlign` and `toolbarAlign` options.
38-
- [x] Fix #193: Add `dataType` option.
39-
- [x] Add flatJSON and editable extensions.
40-
- [x] Add `rowAttributes` option.
41-
- [x] Update documentation.
4220

4321
## Features
4422

@@ -79,7 +57,7 @@ Please provide jsFiddle when creating issues!
7957

8058
It's really saves much time. Use this as template:
8159

82-
[jsFiddle Bootstrap Table](http://jsfiddle.net/8svjf80g/1/)
60+
[jsFiddle Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn/examples/#basic)
8361

8462
Your feedback is very appreciated!
8563

0 commit comments

Comments
 (0)