Skip to content

Commit 11c7a2f

Browse files
wenzhixinwenzhixin
committed
Merge pull request wenzhixin#1901 from wenzhixin/develop
v1.10.0
2 parents 5a5a32a + e731881 commit 11c7a2f

File tree

326 files changed

+3694
-3462
lines changed

Some content is hidden

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

326 files changed

+3694
-3462
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
node_modules
2+
bower_components
23

34
# docs site
45
_gh_pages
56

7+
# build the extensions
8+
extensions.js
9+
610
# deploy the docs
711
deploy.sh
812

‎CHANGELOG.md

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

3+
### 1.10.0
4+
5+
- [bug] Fixed #1619: sub-table checkbox selects all the table.
6+
- [bug] Fixed icons for ability customizing.
7+
- [bug] Fixed #1677: paginationSwitch for server-side.
8+
- [bug] Fixed #1613: padding in footer.
9+
- [bug] Fixed #1742: showRow & hideRow param checks.
10+
- [bug] Fixed getItemField bug.
11+
- [bug] Fixed #617: server side pagination uses `this.options.searchText`.
12+
- [bug] Fixed class name does not apply to checkbox field bug.
13+
- [bug] Fixed clear function and searchFormatter option of filter-control extension.
14+
- [bug] Fixed year computation on cookie extension.
15+
- [bug] Fixed ReorderRows init when reorderable is false.
16+
- [bug] Fix #1660: removed powerpoint type of export extension.
17+
- [enh] Added `title` attribute to pagination controls defining the page number.
18+
- [enh] Added `escape` option.
19+
- [enh] Added `searchOnEnterKey` option.
20+
- [enh] Added `updateFormatText` method.
21+
- [enh] Added a third parameter to `detailFormatter` method passing the jQuery element.
22+
- [enh] Added new param for `updateCell` method to avoid table reinitialization.
23+
- [enh] Removed outline of th.
24+
- [enh] Added extension.json and composer.json files.
25+
- [enh] Added alternative group-by extension.
26+
- [enh] Added sticky-header extension.
27+
- [enh] Added filterLocal option to filter-control extension.
28+
- [enh] Enabled data attributes for editable column.
29+
- [enh] Added IconSize option to export extension.
30+
- [enh] Added tooltip for filter-control toolbar button.
31+
332
### 1.9.1
433

534
- [bug] Removed no records events.

‎CONTRIBUTING.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Contributing to Bootstrap Table
22

3-
Looking to contribute something to Bootstrap Table? **Here's how you can help.**
3+
Looking to contribute something to Bootstrap Table?
4+
5+
**Here's how you can help.**
46

57
Please take a moment to review this document in order to make the contribution
68
process easy and effective for everyone involved.
@@ -36,6 +38,7 @@ restrictions:
3638

3739
Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
3840

41+
- `awaiting reply` - Issues that are awaiting reply, will be closed if there is no any response in 7 days.
3942
- `browser bug` - Issues that are reported to us, but actually are the result of a browser-specific bug. These are diagnosed with reduced test cases and result in an issue opened on that browser's own bug tracker.
4043
- `confirmed` - Issues that have been confirmed with a reduced test case and identify a bug in Bootstrap Table.
4144
- `css` - Issues stemming from our compiled CSS or source CSS files.
@@ -67,11 +70,12 @@ Guidelines for bug reports:
6770
2. **Check if the issue has been fixed** — try to reproduce it using the
6871
latest `master` or development branch in the repository.
6972

70-
3. **Isolate the problem** — ideally create a live example.
71-
[This jsfiddle](http://jsfiddle.net/) is a helpful tools. Consider to use these templates:
73+
3. **Isolate the problem** — ideally create a live example.
74+
The web tool [jsfiddle](http://jsfiddle.net/) is a very helpful for this. Consider to use these templates:
7275
* [Table from html](http://jsfiddle.net/wenyi/e3nk137y/11/light/)
7376
* [Table from data](http://jsfiddle.net/wenyi/e3nk137y/13/light/)
7477
* [Table from url](http://jsfiddle.net/wenyi/e3nk137y/14/light/)
78+
* Other templates can also be found at [jsFiddle Bootstrap](http://bootstrap-table.wenzhixin.net.cn/examples/#basic)
7579

7680

7781
A good bug report shouldn't leave others needing to chase you up for more

‎DONATORS.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
* Luis Triana Vega - $10
1919
* PROMOTUX DI FRANCESCO MELONI E C. S.N.C. - $15
2020
* Emmanuel Kielichowski - $15
21+
* 우공이산 우공이산 - $50
22+
* Empirica srl - $15
23+
* Hassan Gareballa - $10
24+
* Jihwang Yi - $10
2125

2226
## 支付宝
2327

@@ -26,7 +30,12 @@
2630
* 振：20元
2731
* 懒虫：8.8元
2832
* rainc：50元
33+
* 印：10元
34+
* 大个子：50元
35+
* 拓海真一：100元
36+
* IO芒果：7元
2937

3038
## 微信
3139

32-
* 笑：50元
40+
* 笑：50元
41+
* 一牛九毛：100元

‎LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(The MIT License)
22

3-
Copyright (c) 2012-2014 Zhixin Wen <wenzhixin2010@gmail.com>
3+
Copyright (c) 2012-2016 Zhixin Wen <wenzhixin2010@gmail.com>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
21+
THE SOFTWARE.

‎README.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77

88
An extended Bootstrap table with radio, checkbox, sort, pagination, extensions and other added features.
99

10-
To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples), [Example issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aexample+is%3Aclosed), [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed) and [Questions / Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)!
10+
To get started, check out:
11+
12+
* [Docs](http://bootstrap-table.wenzhixin.net.cn)
13+
* [Examples](https://github.com/wenzhixin/bootstrap-table-examples)
14+
* [Questions/Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)
15+
* [问题/帮助](http://segmentfault.com/t/bootstrap-table)
1116

1217

1318
[**List of donators**](https://github.com/wenzhixin/bootstrap-table/blob/master/DONATORS.md)
@@ -58,16 +63,27 @@ npm install bootstrap-table
5863

5964
You can source bootstrap-table directly from a CDN like [CDNJS](http://www.cdnjs.com/libraries/bootstrap-table) or [bootcss](http://open.bootcss.com/bootstrap-table/) or [jsdelivr](http://www.jsdelivr.com/#!bootstrap.table).
6065

61-
## Reporting issues
6266

63-
Please provide jsFiddle when creating issues!
67+
## Contributing
68+
69+
For feature requests, bug reports or submitting pull requests, please ensure you first read [CONTRIBUTING.md](https://github.com/wenzhixin/bootstrap-table/blob/master/CONTRIBUTING.md).
70+
71+
72+
## Reporting Issues
6473

65-
It's really saves much time. Use this as template:
74+
As stated above, please read [CONTRIBUTING.md](https://github.com/wenzhixin/bootstrap-table/blob/master/CONTRIBUTING.md), especially [Bug Reports](https://github.com/wenzhixin/bootstrap-table/blob/master/CONTRIBUTING.md#bug-reports)
75+
76+
And as stated there, please provide jsFiddle when creating issues!
77+
78+
It's really saves much time.
79+
80+
You can also use these for templates:
6681

6782
[jsFiddle Bootstrap Table](http://bootstrap-table.wenzhixin.net.cn/examples/#basic)
6883

6984
Your feedback is very appreciated!
7085

86+
7187
## Acknowledgements
7288

7389
Thanks to everyone who have given feedback and submitted pull requests. A list of all the contributors can be found [here](https://github.com/wenzhixin/bootstrap-table/graphs/contributors).

‎_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ languages: ["en", "zh-cn", "es"]
2323
languages_string: ["English", "简体中文", "Español"]
2424

2525
# Custom vars
26-
current_version: 1.9.1
26+
current_version: 1.10.0
2727
repo: https://github.com/wenzhixin/bootstrap-table
2828
website: http://wenzhixin.net.cn
2929
repos: http://repos.wenzhixin.net.cn

‎bootstrap-table.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-table",
3-
"version": "1.9.1",
3+
"version": "1.10.0",
44
"title": "Bootstrap Table",
55
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination, and other added features.",
66
"author": {

‎composer.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"name": "wenzhixin/bootstrap-table",
3+
"description": "An extended Bootstrap table with radio, checkbox, sort, pagination and other features.",
4+
"keywords": ["bootstrap","table","tablesort","pagination"],
5+
"type": "component",
6+
"homepage": "https://github.com/wenzhixin/bootstrap-table",
7+
"license": "MIT",
8+
"require": {
9+
"twitter/bootstrap": ">=2.3.0"
10+
},
11+
"authors": [
12+
{
13+
"name": "wenzhixin2010",
14+
"email": "wenzhixin2010@gmail.com"
15+
}
16+
]
17+
}

‎dist/bootstrap-table-locale-all.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,15 @@
8282

8383
/**
8484
* Bootstrap Table Catalan translation
85-
* Author: Marc Pina<iwalkalone69@gmail.com>
85+
* Authors: Marc Pina<iwalkalone69@gmail.com>
86+
* Claudi Martinez<claudix.kernel@gmail.com>
8687
*/
8788
(function ($) {
8889
'use strict';
8990

9091
$.fn.bootstrapTable.locales['ca-ES'] = {
9192
formatLoadingMessage: function () {
92-
return 'Si us plau esperi...';
93+
return 'Espereu, si us plau...';
9394
},
9495
formatRecordsPerPage: function (pageNumber) {
9596
return pageNumber + ' resultats per pàgina';
@@ -98,19 +99,19 @@
9899
return 'Mostrant de ' + pageFrom + ' fins ' + pageTo + ' - total ' + totalRows + ' resultats';
99100
},
100101
formatSearch: function () {
101-
return 'Buscar';
102+
return 'Cerca';
102103
},
103104
formatNoMatches: function () {
104105
return 'No s\'han trobat resultats';
105106
},
106107
formatPaginationSwitch: function () {
107-
return 'Amagar/Mostrar paginació';
108+
return 'Amaga/Mostra paginació';
108109
},
109110
formatRefresh: function () {
110-
return 'Refrescar';
111+
return 'Refresca';
111112
},
112113
formatToggle: function () {
113-
return 'Amagar/Mostrar';
114+
return 'Alterna formatació';
114115
},
115116
formatColumns: function () {
116117
return 'Columnes';
@@ -285,7 +286,7 @@
285286
return 'Loading, please wait...';
286287
},
287288
formatRecordsPerPage: function (pageNumber) {
288-
return pageNumber + ' records per page';
289+
return pageNumber + ' rows per page';
289290
},
290291
formatShowingRows: function (pageFrom, pageTo, totalRows) {
291292
return 'Showing ' + pageFrom + ' to ' + pageTo + ' of ' + totalRows + ' rows';
@@ -316,6 +317,7 @@
316317
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['en-US']);
317318

318319
})(jQuery);
320+
319321
/**
320322
* Bootstrap Table Spanish (Argentina) translation
321323
* Author: Felix Vera (felix.vera@gmail.com)
@@ -1048,13 +1050,28 @@
10481050
return pageNumber + ' records per pagina';
10491051
},
10501052
formatShowingRows: function (pageFrom, pageTo, totalRows) {
1051-
return 'Toon ' + pageFrom + ' tot ' + pageTo + ' van ' + totalRows + ' records';
1053+
return 'Toon ' + pageFrom + ' tot ' + pageTo + ' van ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
1054+
},
1055+
formatDetailPagination: function (totalRows) {
1056+
return 'Toon ' + totalRows + ' record' + ((totalRows > 1) ? 's' : '');
10521057
},
10531058
formatSearch: function () {
10541059
return 'Zoeken';
10551060
},
10561061
formatNoMatches: function () {
10571062
return 'Geen resultaten gevonden';
1063+
},
1064+
formatRefresh: function () {
1065+
return 'Vernieuwen';
1066+
},
1067+
formatToggle: function () {
1068+
return 'Omschakelen';
1069+
},
1070+
formatColumns: function () {
1071+
return 'Kolommen';
1072+
},
1073+
formatAllRows: function () {
1074+
return 'Alle';
10581075
}
10591076
};
10601077

@@ -1244,6 +1261,9 @@
12441261
},
12451262
formatColumns: function () {
12461263
return 'Колонки';
1264+
},
1265+
formatClearFilters: function () {
1266+
return 'Очистить фильтры';
12471267
}
12481268
};
12491269

@@ -1571,13 +1591,13 @@
15711591
return '搜尋';
15721592
},
15731593
formatNoMatches: function () {
1574-
return '沒有找符合的結果';
1594+
return '沒有找到符合的結果';
15751595
},
15761596
formatPaginationSwitch: function () {
15771597
return '隱藏/顯示分頁';
15781598
},
15791599
formatRefresh: function () {
1580-
return '刷新';
1600+
return '重新整理';
15811601
},
15821602
formatToggle: function () {
15831603
return '切換';

‎dist/bootstrap-table-locale-all.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bootstrap-table.css

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @author zhixin wen <wenzhixin2010@gmail.com>
3-
* version: 1.8.1
3+
* version: 1.10.0
44
* https://github.com/wenzhixin/bootstrap-table/
55
*/
66

@@ -17,7 +17,7 @@
1717
.bootstrap-table .table:not(.table-condensed) > thead > tr > td,
1818
.bootstrap-table .table:not(.table-condensed) > tbody > tr > td,
1919
.bootstrap-table .table:not(.table-condensed) > tfoot > tr > td {
20-
padding: 8px !important;
20+
padding: 8px;
2121
}
2222

2323
.bootstrap-table .table.table-no-bordered > thead > tr > th,
@@ -64,6 +64,10 @@
6464
border-left: 1px solid #dddddd;
6565
}
6666

67+
.fixed-table-container thead th:focus {
68+
outline: 0 solid transparent;
69+
}
70+
6771
.fixed-table-container thead th:first-child {
6872
border-left: none;
6973
border-top-left-radius: 4px;
@@ -274,6 +278,7 @@
274278
.bootstrap-table .fixed-table-footer .table {
275279
border-bottom: none;
276280
border-radius: 0;
281+
padding: 0 !important;
277282
}
278283

279284
.pull-right .dropdown-menu {

0 commit comments

Comments
 (0)