Skip to content

Wrap response in table tag #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2017
Merged

Wrap response in table tag #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1754ed8
Wrap response in table tag
ithielnor Sep 6, 2017
f56222e
Use children instead of find
ithielnor Sep 6, 2017
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
8 changes: 4 additions & 4 deletions Griddly/Scripts/griddly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,16 +1194,16 @@
this.options.pageCount = Math.ceil(this.options.count / this.options.pageSize);
// TODO: handle smaller count

var html = $(data);
var html = $("<table>" + data + "</table>");

// replaceWith is more performant, but using inner html allows us to maintain the tbody element which is potentially important for some other libraries
// https://github.com/programcsharp/griddly/issues/79
this.$element.find("tbody.data").html(html.filter("tbody").html());
this.$element.find("tbody.data").html(html.children("tbody").html());

var tfoot = this.$element.find("tfoot");

if (tfoot.length && html.is("tfoot"))
tfoot.replaceWith(html.filter("tfoot"));
if (tfoot.length && html.children("tfoot").length)
tfoot.replaceWith(html.children("tfoot"));

var startRecord = this.options.pageNumber * this.options.pageSize;
this.$element.find(".griddly-summary").html('<span class="hidden-xs">Records</span> ' + (startRecord + (this.options.count ? 1 : 0)) + ' <span class="hidden-xs">through</span><span class="visible-xs">-</span> ' + (startRecord + currentPageSize) + " of " + this.options.count);
Expand Down