Skip to content

Added data-attribute no-expander to <columns> to disable the .expander #29

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
rafibomb merged 2 commits into from
May 18, 2016
Merged

Added data-attribute no-expander to <columns> to disable the .expander #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ea4b7
Added data-attribute no-expander to <columns> to disable the .expande…
Apr 5, 2016
7c44b44
Data-attribute no-expander to <columns> also accepts false / true
Apr 5, 2016
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
3 changes: 2 additions & 1 deletion lib/makeColumn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ module.exports = function(col) {
// Check for sizes. If no attribute is provided, default to small-12. Divide evenly for large columns
var smallSize = $(col).attr('small') || this.columnCount;
var largeSize = $(col).attr('large') || $(col).attr('small') || Math.floor(this.columnCount / colCount);
var noExpander = $(col).attr('no-expander');

classes.push(format('small-%s', smallSize));
classes.push(format('large-%s', largeSize));
Expand All @@ -38,7 +39,7 @@ module.exports = function(col) {

// If the column contains a nested row, the .expander class should not be used
// The == on the first check is because we're comparing a string pulled from $.attr() to a number
if (largeSize == this.columnCount && col.find('.row, row').length === 0) {
if (largeSize == this.columnCount && col.find('.row, row').length === 0 && (noExpander == undefined || noExpander == "false") ) {
expander = '\n<th class="expander"></th>';
}

Expand Down
46 changes: 46 additions & 0 deletions test/grid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,52 @@ describe('Grid', () => {
compare(input, expected);
});

it('creates a single column with first and last classes with no-expander', function () {
var input = '<columns large="12" small="12" no-expander>One</columns>';
var expected = `
<th class="small-12 large-12 columns first last">
<table>
<tr>
<th>One</th>
</tr>
</table>
</th>
`;

compare(input, expected);
});

it('creates a single column with first and last classes with no-expander="false"', function () {
var input = '<columns large="12" small="12" no-expander="false">One</columns>';
var expected = `
<th class="small-12 large-12 columns first last">
<table>
<tr>
<th>One</th>
<th class="expander"></th>
</tr>
</table>
</th>
`;

compare(input, expected);
});

it('creates a single column with first and last classes with no-expander="true"', function () {
var input = '<columns large="12" small="12" no-expander="true">One</columns>';
var expected = `
<th class="small-12 large-12 columns first last">
<table>
<tr>
<th>One</th>
</tr>
</table>
</th>
`;

compare(input, expected);
});

it('creates two columns, one first, one last', function () {
var input = `
<columns large="6" small="12">One</columns>
Expand Down