Skip to content

case insensitive search, renderColumnSelection does not list the column if the column text is empty, general fix for cell rendering, in case the cell has an html inside (like a button or anchor) #170

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

Closed
nsavga wants to merge 3 commits into from
Closed

case insensitive search, renderColumnSelection does not list the column if the column text is empty, general fix for cell rendering, in case the cell has an html inside (like a button or anchor) #170

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b7f1b2
case insensitive search,
nsavga Jul 2, 2015
e1e77b9
cell rendering, commented code deleted
nsavga Jul 2, 2015
2dec600
fixed my previous mistake for the problem in case item is null. (rend…
nsavga Jul 2, 2015
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
48 changes: 25 additions & 23 deletions src/internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ function loadData()
function containsPhrase(row)
{
var column,
searchPattern = new RegExp(that.searchPhrase, (that.options.caseSensitive) ? "g" : "gi");
searchPattern = new RegExp(that.searchPhrase, (that.options.caseInsensitive) ? "g" : "gi");

for (var i = 0; i < that.columns.length; i++)
{
Expand Down Expand Up @@ -271,7 +271,7 @@ function loadRows()

$.each(that.columns, function (i, column)
{
row[column.id] = column.converter.from(cells.eq(i).text());
row[column.id] = column.converter.from(cells.eq(i).html());
});

appendRow.call(that, row);
Expand Down Expand Up @@ -372,27 +372,29 @@ function renderColumnSelection(actions)

$.each(this.columns, function (i, column)
{
var item = $(tpl.actionDropDownCheckboxItem.resolve(getParams.call(that,
{ name: column.id, label: column.text, checked: column.visible })))
.on("click" + namespace, selector, function (e)
{
e.stopPropagation();

var $this = $(this),
checkbox = $this.find(checkboxSelector);
if (!checkbox.prop("disabled"))
{
column.visible = checkbox.prop("checked");
var enable = that.columns.where(isVisible).length > 1;
$this.parents(itemsSelector).find(selector + ":has(" + checkboxSelector + ":checked)")
._bgEnableAria(enable).find(checkboxSelector)._bgEnableField(enable);

that.element.find("tbody").empty(); // Fixes an column visualization bug
renderTableHeader.call(that);
loadData.call(that);
}
});
dropDown.find(getCssSelector(css.dropDownMenuItems)).append(item);
var columnText = $.trim(column.text);
if (columnText !== '') {
var item = $(tpl.actionDropDownCheckboxItem.resolve(getParams.call(that,
{ name: column.id, label: column.text, checked: column.visible })))
.on("click" + namespace, selector, function (e) {
e.stopPropagation();

var $this = $(this),
checkbox = $this.find(checkboxSelector);
if (!checkbox.prop("disabled")) {
column.visible = checkbox.prop("checked");
var enable = that.columns.where(isVisible).length > 1;
$this.parents(itemsSelector).find(selector + ":has(" + checkboxSelector + ":checked)")
._bgEnableAria(enable).find(checkboxSelector)._bgEnableField(enable);

that.element.find("tbody").empty(); // Fixes an column visualization bug
renderTableHeader.call(that);
loadData.call(that);
}
});
dropDown.find(getCssSelector(css.dropDownMenuItems)).append(item);
}

});
actions.append(dropDown);
}
Expand Down