Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed dist/jQuery.Bootgrid.1.3.5.nupkg
Binary file not shown.
Binary file modified dist/jquery.bootgrid-1.3.5.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/jquery.bootgrid.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* jQuery Bootgrid v1.3.5 - 03/11/2019
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2019 Deciso B.V. (http://www.jquery-bootgrid.com)
* jQuery Bootgrid v1.3.5 - 11/17/2021
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2021 Deciso B.V. (http://www.jquery-bootgrid.com)
* Licensed under the MIT license. See LICENSE.txt for more details.
*/
.bootgrid-header,
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.bootgrid.fa.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* jQuery Bootgrid v1.3.5 - 03/11/2019
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2019 Deciso B.V. (http://www.jquery-bootgrid.com)
* jQuery Bootgrid v1.3.5 - 11/17/2021
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2021 Deciso B.V. (http://www.jquery-bootgrid.com)
* Licensed under the MIT license. See LICENSE.txt for more details.
*/
;(function ($, window, undefined)
Expand Down
17 changes: 11 additions & 6 deletions dist/jquery.bootgrid.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* jQuery Bootgrid v1.3.5 - 03/11/2019
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2019 Deciso B.V. (http://www.jquery-bootgrid.com)
* jQuery Bootgrid v1.3.5 - 11/17/2021
* Copyright © 2014-2015 Rafael J. Staib; Copyright © 2018-2021 Deciso B.V. (http://www.jquery-bootgrid.com)
* Licensed under the MIT license. See LICENSE.txt for more details.
*/
;(function ($, window, undefined)
Expand Down Expand Up @@ -1219,10 +1219,10 @@ Grid.defaults = {
datetime: {
// convert datetime type fields from unix timestamp to readable format
from: function (value) {
return moment(parseInt(value)*1000);
return value ? moment(parseInt(value)*1000) : "";
},
to: function (value) {
return value.format("lll");
return value ? value.format("lll") : "";
}
},
memsize: {
Expand Down Expand Up @@ -1446,9 +1446,14 @@ Grid.prototype.append = function(rows)
var appendedRows = [];
for (var i = 0; i < rows.length; i++)
{
if (appendRow.call(this, rows[i]))
var row = rows[i];
for (var j = 0; j < this.columns.length; j++) {
var column = this.columns[j];
row[column.id] = column.converter.from(row[column.id]);
}
if (appendRow.call(this, row))
{
appendedRows.push(rows[i]);
appendedRows.push(row);
}
}
sortRows.call(this);
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.bootgrid.min.css

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

2 changes: 1 addition & 1 deletion dist/jquery.bootgrid.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

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