Skip to content

Commit 1bfc280

Browse files
AdSchellevisAdSchellevis
committed
minor enhancements,
- support header html data - blank unparseable numeric fields
1 parent 769388d commit 1bfc280

12 files changed

+36
-15
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"accessibility",
1414
"bootstrap"
1515
],
16-
"version": "1.3.4",
16+
"version": "1.3.5",
1717
"authors": [
1818
{
1919
"name": "Rafael Staib",

‎dist/jQuery.Bootgrid.1.3.5.nupkg‎

25.8 KB
Binary file not shown.

‎dist/jquery.bootgrid-1.3.5.zip‎

28.5 KB
Binary file not shown.

‎dist/jquery.bootgrid.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery Bootgrid v1.3.4 - 03/08/2019
2+
* jQuery Bootgrid v1.3.5 - 03/11/2019
33
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2019 Deciso B.V. (http://www.jquery-bootgrid.com)
44
* Licensed under the MIT license. See LICENSE.txt for more details.
55
*/

‎dist/jquery.bootgrid.fa.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery Bootgrid v1.3.4 - 03/08/2019
2+
* jQuery Bootgrid v1.3.5 - 03/11/2019
33
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2019 Deciso B.V. (http://www.jquery-bootgrid.com)
44
* Licensed under the MIT license. See LICENSE.txt for more details.
55
*/

‎dist/jquery.bootgrid.fa.min.js‎

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

‎dist/jquery.bootgrid.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery Bootgrid v1.3.4 - 03/08/2019
2+
* jQuery Bootgrid v1.3.5 - 03/11/2019
33
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2019 Deciso B.V. (http://www.jquery-bootgrid.com)
44
* Licensed under the MIT license. See LICENSE.txt for more details.
55
*/
@@ -116,7 +116,7 @@ function loadColumns()
116116
id: data.columnId,
117117
identifier: that.identifier == null && data.identifier || false,
118118
converter: that.options.converters[data.converter || data.type] || that.options.converters["string"],
119-
text: $this.text(),
119+
text: $this.html(),
120120
align: data.align || "left",
121121
headerAlign: data.headerAlign || "left",
122122
cssClass: data.cssClass || "",
@@ -127,7 +127,7 @@ function loadColumns()
127127
sortable: !(data.sortable === false), // default: true
128128
visible: !(data.visible === false), // default: true
129129
visibleInSelection: !(data.visibleInSelection === false), // default: true
130-
width: ($.isNumeric(data.width)) ? data.width + "px" :
130+
width: ($.isNumeric(data.width)) ? data.width + "px" :
131131
(typeof(data.width) === "string") ? data.width : null
132132
};
133133
that.columns.push(column);
@@ -390,7 +390,7 @@ function renderColumnSelection(actions)
390390
.on("click" + namespace, selector, function (e)
391391
{
392392
e.stopPropagation();
393-
393+
394394
var $this = $(this),
395395
checkbox = $this.find(checkboxSelector);
396396
if (!checkbox.prop("disabled"))
@@ -399,7 +399,7 @@ function renderColumnSelection(actions)
399399
var enable = that.columns.where(isVisible).length > 1;
400400
$this.parents(itemsSelector).find(selector + ":has(" + checkboxSelector + ":checked)")
401401
._bgEnableAria(enable).find(checkboxSelector)._bgEnableField(enable);
402-
402+
403403
that.element.find("tbody").empty(); // Fixes an column visualization bug
404404
renderTableHeader.call(that);
405405
loadData.call(that);
@@ -1202,7 +1202,14 @@ Grid.defaults = {
12021202
converters: {
12031203
numeric: {
12041204
from: function (value) { return +value; }, // converts from string to numeric
1205-
to: function (value) { return value + ""; } // converts from numeric to string
1205+
to: function (value) {
1206+
// converts from numeric to string
1207+
if (value === undefined) {
1208+
return "";
1209+
} else {
1210+
return value + "";
1211+
}
1212+
}
12061213
},
12071214
string: {
12081215
// default converter

‎dist/jquery.bootgrid.min.css‎

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

‎dist/jquery.bootgrid.min.js‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "jquery-bootgrid",
33
"namespace": "jquery.bootgrid",
44
"title": "jQuery Bootgrid",
5-
"version": "1.3.4",
5+
"version": "1.3.5",
66
"description": "Nice, sleek and intuitive. A grid control especially designed for bootstrap.",
77
"homepage": "http://www.jquery-bootgrid.com",
88
"author": {

0 commit comments

Comments
 (0)