Skip to content

Commit 814979d

Browse files
wenzhixinwenzhixin
committed
Update version to 1.8.0
1 parent 01c2acc commit 814979d

File tree

158 files changed

+5648
-134
lines changed

Some content is hidden

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

158 files changed

+5648
-134
lines changed

‎Gruntfile.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,17 @@ module.exports = function(grunt) {
6565
}
6666
},
6767
copy: {
68-
files: {
69-
cwd: 'dist', // set working folder / root to copy
70-
src: '**/*', // copy all files and subfolders
71-
dest: 'docs/dist', // destination folder
72-
expand: true // required when using cwd
73-
},
7468
source: {
7569
cwd: 'src', // set working folder / root to copy
7670
src: ['**/*.js', '**/*.css'], // copy all files and subfolders
7771
dest: 'dist', // destination folder
7872
expand: true // required when using cwd
73+
},
74+
files: {
75+
cwd: 'dist', // set working folder / root to copy
76+
src: '**/*', // copy all files and subfolders
77+
dest: 'docs/dist', // destination folder
78+
expand: true // required when using cwd
7979
}
8080
}
8181
});

‎dist/bootstrap-table-all.js

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

@@ -246,6 +246,12 @@
246246
onAll: function (name, args) {
247247
return false;
248248
},
249+
onClickCell: function (field, value, row, $element) {
250+
return false;
251+
},
252+
onDblClickCell: function (field, value, row, $element) {
253+
return false;
254+
},
249255
onClickRow: function (item, $element) {
250256
return false;
251257
},
@@ -374,6 +380,8 @@
374380

375381
BootstrapTable.EVENTS = {
376382
'all.bs.table': 'onAll',
383+
'click-cell.bs.table': 'onClickCell',
384+
'dbl-click-cell.bs.table': 'onDblClickCell',
377385
'click-row.bs.table': 'onClickRow',
378386
'dbl-click-row.bs.table': 'onDblClickRow',
379387
'sort.bs.table': 'onSort',
@@ -1383,8 +1391,15 @@
13831391

13841392
// click to select by column
13851393
this.$body.find('> tr > td').off('click').on('click', function () {
1386-
var $tr = $(this).parent();
1387-
that.trigger('click-row', that.data[$tr.data('index')], $tr);
1394+
var $td = $(this),
1395+
$tr = $td.parent(),
1396+
item = that.data[$tr.data('index')],
1397+
cellIndex = $td[0].cellIndex,
1398+
$headerCell = that.$header.find('th:eq(' + cellIndex + ')'),
1399+
field = $headerCell.data('field'),
1400+
value = item[field];
1401+
that.trigger('click-cell', field, value, item, $td);
1402+
that.trigger('click-row', item, $tr);
13881403
// if click to select - then trigger the checkbox/radio click
13891404
if (that.options.clickToSelect) {
13901405
if (that.header.clickToSelects[$tr.children().index($(this))]) {
@@ -1393,8 +1408,16 @@
13931408
}
13941409
}
13951410
});
1396-
this.$body.find('> tr').off('dblclick').on('dblclick', function () {
1397-
that.trigger('dbl-click-row', that.data[$(this).data('index')], $(this));
1411+
this.$body.find('> tr > td').off('dblclick').on('dblclick', function () {
1412+
var $td = $(this),
1413+
$tr = $td.parent(),
1414+
item = that.data[$tr.data('index')],
1415+
cellIndex = $td[0].cellIndex,
1416+
$headerCell = that.$header.find('th:eq(' + cellIndex + ')'),
1417+
field = $headerCell.data('field'),
1418+
value = item[field];
1419+
that.trigger('dbl-click-cell', field, value, item, $td);
1420+
that.trigger('dbl-click-row', item, $tr);
13981421
});
13991422

14001423
this.$body.find('> tr > td > .detail-icon').off('click').on('click', function () {

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

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

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/bootstrap-table.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* @author zhixin wen <wenzhixin2010@gmail.com>
3-
* version: 1.7.0
3+
* version: 1.8.0
44
* https://github.com/wenzhixin/bootstrap-table/
55
*/
66

‎dist/bootstrap-table.js

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

@@ -246,6 +246,12 @@
246246
onAll: function (name, args) {
247247
return false;
248248
},
249+
onClickCell: function (field, value, row, $element) {
250+
return false;
251+
},
252+
onDblClickCell: function (field, value, row, $element) {
253+
return false;
254+
},
249255
onClickRow: function (item, $element) {
250256
return false;
251257
},
@@ -374,6 +380,8 @@
374380

375381
BootstrapTable.EVENTS = {
376382
'all.bs.table': 'onAll',
383+
'click-cell.bs.table': 'onClickCell',
384+
'dbl-click-cell.bs.table': 'onDblClickCell',
377385
'click-row.bs.table': 'onClickRow',
378386
'dbl-click-row.bs.table': 'onDblClickRow',
379387
'sort.bs.table': 'onSort',
@@ -1383,8 +1391,15 @@
13831391

13841392
// click to select by column
13851393
this.$body.find('> tr > td').off('click').on('click', function () {
1386-
var $tr = $(this).parent();
1387-
that.trigger('click-row', that.data[$tr.data('index')], $tr);
1394+
var $td = $(this),
1395+
$tr = $td.parent(),
1396+
item = that.data[$tr.data('index')],
1397+
cellIndex = $td[0].cellIndex,
1398+
$headerCell = that.$header.find('th:eq(' + cellIndex + ')'),
1399+
field = $headerCell.data('field'),
1400+
value = item[field];
1401+
that.trigger('click-cell', field, value, item, $td);
1402+
that.trigger('click-row', item, $tr);
13881403
// if click to select - then trigger the checkbox/radio click
13891404
if (that.options.clickToSelect) {
13901405
if (that.header.clickToSelects[$tr.children().index($(this))]) {
@@ -1393,8 +1408,16 @@
13931408
}
13941409
}
13951410
});
1396-
this.$body.find('> tr').off('dblclick').on('dblclick', function () {
1397-
that.trigger('dbl-click-row', that.data[$(this).data('index')], $(this));
1411+
this.$body.find('> tr > td').off('dblclick').on('dblclick', function () {
1412+
var $td = $(this),
1413+
$tr = $td.parent(),
1414+
item = that.data[$tr.data('index')],
1415+
cellIndex = $td[0].cellIndex,
1416+
$headerCell = that.$header.find('th:eq(' + cellIndex + ')'),
1417+
field = $headerCell.data('field'),
1418+
value = item[field];
1419+
that.trigger('dbl-click-cell', field, value, item, $td);
1420+
that.trigger('dbl-click-row', item, $tr);
13981421
});
13991422

14001423
this.$body.find('> tr > td > .detail-icon').off('click').on('click', function () {

‎dist/bootstrap-table.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/extensions/cookie/bootstrap-table-cookie.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/editable/bootstrap-table-editable.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/export/bootstrap-table-export.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/filter-control/bootstrap-table-filter-control.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/filter/bootstrap-table-filter.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/flat-json/bootstrap-table-flat-json.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/key-events/bootstrap-table-key-events.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/mobile/bootstrap-table-mobile.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/natural-sorting/bootstrap-table-natural-sorting.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/resizable/bootstrap-table-resizable.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/extensions/toolbar/bootstrap-table-toolbar.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-ar-SA.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-cs-CZ.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-da-DK.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-de-DE.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-el-GR.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-en-US.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-es-AR.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-es-CR.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-es-MX.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-es-NI.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-es-SP.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-fr-BE.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-fr-FR.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-hu-HU.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-it-IT.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-ja-JP.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-ka-GE.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/locale/bootstrap-table-ko-KR.min.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* bootstrap-table - v1.7.0 - 2015-05-22
2+
* bootstrap-table - v1.8.0 - 2015-05-22
33
* https://github.com/wenzhixin/bootstrap-table
44
* Copyright (c) 2015 zhixin wen
55
* Licensed MIT License

‎dist/locale/bootstrap-table-ms-MY.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)