Skip to content

Commit

Permalink
release 1.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzhixin committed Feb 17, 2016
1 parent e90065a commit 64a7f77
Show file tree
Hide file tree
Showing 146 changed files with 464 additions and 243 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ languages: ["en", "zh-cn", "es"]
languages_string: ["English", "简体中文", "Español"]

# Custom vars
current_version: 1.10.0
current_version: 1.10.1
repo: https://github.com/wenzhixin/bootstrap-table
website: http://wenzhixin.net.cn
repos: http://repos.wenzhixin.net.cn
Expand Down
47 changes: 46 additions & 1 deletion dist/bootstrap-table-locale-all.js
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,50 @@

})(jQuery);

/**
* Bootstrap Table Hebrew translation
* Author: legshooter
*/
(function ($) {
'use strict';

$.fn.bootstrapTable.locales['he-IL'] = {
formatLoadingMessage: function () {
return 'טוען, נא להמתין...';
},
formatRecordsPerPage: function (pageNumber) {
return pageNumber + ' שורות בעמוד';
},
formatShowingRows: function (pageFrom, pageTo, totalRows) {
return 'מציג ' + pageFrom + ' עד ' + pageTo + ' מ-' + totalRows + ' שורות';
},
formatSearch: function () {
return 'חיפוש';
},
formatNoMatches: function () {
return 'לא נמצאו רשומות תואמות';
},
formatPaginationSwitch: function () {
return 'הסתר/הצג מספור דפים';
},
formatRefresh: function () {
return 'רענן';
},
formatToggle: function () {
return 'החלף תצוגה';
},
formatColumns: function () {
return 'עמודות';
},
formatAllRows: function () {
return 'הכל';
}
};

$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['he-IL']);

})(jQuery);

/**
* Bootstrap Table Croatian translation
* Author: Petra Štrbenac ([email protected])
Expand Down Expand Up @@ -1292,7 +1336,7 @@
return 'Vyhľadávanie';
},
formatNoMatches: function () {
return 'Nenájdená žiadne vyhovujúca položka';
return 'Nenájdená žiadna vyhovujúca položka';
},
formatRefresh: function () {
return 'Obnoviť';
Expand All @@ -1308,6 +1352,7 @@
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['sk-SK']);

})(jQuery);

/**
* Bootstrap Table Swedish translation
* Author: C Bratt <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions dist/bootstrap-table-locale-all.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/bootstrap-table.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @author zhixin wen <[email protected]>
* version: 1.10.0
* version: 1.10.1
* https://github.com/wenzhixin/bootstrap-table/
*/

Expand Down
18 changes: 16 additions & 2 deletions dist/bootstrap-table.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @author zhixin wen <[email protected]>
* version: 1.10.0
* version: 1.10.1
* https://github.com/wenzhixin/bootstrap-table/
*/

Expand Down Expand Up @@ -2439,6 +2439,20 @@
this.checkAll_(false);
};

BootstrapTable.prototype.checkInvert = function () {
var that = this;
var rows = that.$selectItem.filter(':enabled');
var checked = rows.filter(':checked');
rows.each(function() {
$(this).prop('checked', !$(this).prop('checked'));
});
that.updateRows();
that.updateSelected();
that.trigger('uncheck-some', checked);
checked = that.getSelections();
that.trigger('check-some', checked);
};

BootstrapTable.prototype.checkAll_ = function (checked) {
var rows;
if (!checked) {
Expand Down Expand Up @@ -2718,7 +2732,7 @@
'insertRow', 'updateRow', 'updateCell', 'updateByUniqueId', 'removeByUniqueId',
'getRowByUniqueId', 'showRow', 'hideRow', 'getRowsHidden',
'mergeCells',
'checkAll', 'uncheckAll',
'checkAll', 'uncheckAll', 'checkInvert',
'check', 'uncheck',
'checkBy', 'uncheckBy',
'refresh',
Expand Down
4 changes: 2 additions & 2 deletions dist/bootstrap-table.min.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/angular/bootstrap-table-angular.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/cookie/bootstrap-table-cookie.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/editable/bootstrap-table-editable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/export/bootstrap-table-export.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 41 additions & 31 deletions dist/extensions/filter-control/bootstrap-table-filter-control.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,46 @@
}
};

var initFilterSelectControls = function (bootstrapTable) {
var data = bootstrapTable.options.data,
itemsPerPage = bootstrapTable.pageTo < bootstrapTable.options.data.length ? bootstrapTable.options.data.length : bootstrapTable.pageTo,

isColumnSearchableViaSelect = function (column) {
return column.filterControl && column.filterControl.toLowerCase() === 'select' && column.searchable;
},

isFilterDataNotGiven = function (column) {
return column.filterData === undefined || column.filterData.toLowerCase() === 'column';
},

hasSelectControlElement = function (selectControl) {
return selectControl && selectControl.length > 0;
};

for (var i = bootstrapTable.pageFrom - 1; i < bootstrapTable.pageTo; i++) {

$.each(bootstrapTable.header.fields, function (j, field) {
var column = bootstrapTable.columns[$.fn.bootstrapTable.utils.getFieldIndex(bootstrapTable.columns, field)],
selectControl = $('.' + column.field);


if (isColumnSearchableViaSelect(column) && isFilterDataNotGiven(column) && hasSelectControlElement(selectControl)) {
if (selectControl.get(selectControl.length - 1).options.length === 0) {
//Added the default option
addOptionToSelectControl(selectControl, '', '');
}

//Added a new value
var fieldValue = data[i][field],
formattedValue = $.fn.bootstrapTable.utils.calculateObjectValue(bootstrapTable.header, bootstrapTable.header.formatters[j], [fieldValue, data[i], i], fieldValue);

addOptionToSelectControl(selectControl, fieldValue, formattedValue);
}
});
}

}

var createControls = function (that, header) {
var addedFilterControl = false,
isVisible,
Expand Down Expand Up @@ -372,37 +412,7 @@
BootstrapTable.prototype.initBody = function () {
_initBody.apply(this, Array.prototype.slice.apply(arguments));

var that = this,
data = this.options.data,
pageTo = this.pageTo < this.options.data.length ? this.options.data.length : this.pageTo;

for (var i = this.pageFrom - 1; i < pageTo; i++) {
var item = data[i];

$.each(this.header.fields, function (j, field) {
var value = item[field],
column = that.columns[$.fn.bootstrapTable.utils.getFieldIndex(that.columns, field)];

value = $.fn.bootstrapTable.utils.calculateObjectValue(that.header, that.header.formatters[j], [value, item, i], value);

if ((!column.checkbox) || (!column.radio)) {
if (column.filterControl !== undefined && column.filterControl.toLowerCase() === 'select' && column.searchable) {
if (column.filterData === undefined || column.filterData.toLowerCase() === 'column') {
var selectControl = $('.' + column.field);
if (selectControl !== undefined && selectControl.length > 0) {
if (selectControl.get(selectControl.length - 1).options.length === 0) {
//Added the default option
addOptionToSelectControl(selectControl, '', '');
}

//Added a new value
addOptionToSelectControl(selectControl, value, value);
}
}
}
}
});
}
initFilterSelectControls(this);
};

BootstrapTable.prototype.initSearch = function () {
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/extensions/filter/bootstrap-table-filter.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/flat-json/bootstrap-table-flat-json.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/group-by/bootstrap-table-group-by.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/key-events/bootstrap-table-key-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
$toggle = that.$toolbar.find('button[name="toggle"]'),
$paginationSwitch = that.$toolbar.find('button[name="paginationSwitch"]');

if (document.activeElement === $search.get(0)) {
if (document.activeElement === $search.get(0) || !$.contains(document.activeElement ,that.$toolbar.get(0))) {
return true;
}

Expand Down
4 changes: 2 additions & 2 deletions dist/extensions/key-events/bootstrap-table-key-events.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/mobile/bootstrap-table-mobile.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* bootstrap-table - v1.10.0 - 2016-01-19
* bootstrap-table - v1.10.1 - 2016-02-17
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2016 zhixin wen
* Licensed MIT License
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/resizable/bootstrap-table-resizable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extensions/toolbar/bootstrap-table-toolbar.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locale/bootstrap-table-af-ZA.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locale/bootstrap-table-ar-SA.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locale/bootstrap-table-ca-ES.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locale/bootstrap-table-cs-CZ.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/locale/bootstrap-table-da-DK.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* bootstrap-table - v1.10.0 - 2016-01-19
* bootstrap-table - v1.10.1 - 2016-02-17
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2016 zhixin wen
* Licensed MIT License
Expand Down
2 changes: 1 addition & 1 deletion dist/locale/bootstrap-table-de-DE.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* bootstrap-table - v1.10.0 - 2016-01-19
* bootstrap-table - v1.10.1 - 2016-02-17
* https://github.com/wenzhixin/bootstrap-table
* Copyright (c) 2016 zhixin wen
* Licensed MIT License
Expand Down
Loading

0 comments on commit 64a7f77

Please sign in to comment.