Skip to content

Commit

Permalink
Merge branch 'release/3.1.5' into V3
Browse files Browse the repository at this point in the history
  • Loading branch information
steveush committed Jul 6, 2017
2 parents 88d1a67 + 6a6d691 commit 5a6f43b
Show file tree
Hide file tree
Showing 105 changed files with 11,048 additions and 497 deletions.
16 changes: 13 additions & 3 deletions GruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,21 @@ module.exports = function (grunt) {
],
dest: "compiled/footable.state.js"
},
export_js: {
src: [
"src/js/components/export/**/*.js"
],
dest: "compiled/footable.export.js"
},
all_js: {
src: [
"compiled/footable.core.js",
"compiled/footable.filtering.js",
"compiled/footable.sorting.js",
"compiled/footable.paging.js",
"compiled/footable.editing.js",
"compiled/footable.state.js"
"compiled/footable.state.js",
"compiled/footable.export.js"
],
dest: "compiled/footable.js"
},
Expand Down Expand Up @@ -156,7 +163,8 @@ module.exports = function (grunt) {
'compiled/footable.sorting.min.js': [ "compiled/footable.sorting.js" ],
'compiled/footable.paging.min.js': [ "compiled/footable.paging.js" ],
'compiled/footable.editing.min.js': [ "compiled/footable.editing.js" ],
'compiled/footable.state.min.js': [ "compiled/footable.state.js" ]
'compiled/footable.state.min.js': [ "compiled/footable.state.js" ],
'compiled/footable.export.min.js': [ "compiled/footable.export.js" ]
}
}
},
Expand Down Expand Up @@ -259,7 +267,9 @@ module.exports = function (grunt) {
'footable.editing.js',
'footable.editing.min.js',
'footable.state.js',
'footable.state.min.js'
'footable.state.min.js',
'footable.export.js',
'footable.export.min.js'
],
dest: 'js/'
}]
Expand Down
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,26 @@ Pull requests need to be made against the [develop branch](https://github.com/fo

# Changelog #

### 3.1.5

- Added two new events `expanded.ft.row` and `collapsed.ft.row` that occur after there complementary `expand.ft.row` and `collapse.ft.row` events.
- Added a new `FooTable.Export` component which exposes two primary methods on the `FooTable.Table` object, `.toJSON()` and `.toCSV()`.
- Added a new `array` column type to make rendering JavaScript arrays as cell contents easier.
- Added a new `object` column type to make rendering JavaScript objects containing multiple properties as cell contents easier.
- Added a new `container` option to the filtering component. This option allows you to provide a selector to specify where the filtering form is rendered. The selector should match only a single element and if multiple are found only the first is used.
- Added a new `container` option to the paging component. This option allows you to provide a selector to specify where the paging UI is rendered. The selector should match only a single element and if multiple are found only the first is used.
- Added `redrawSelf` as an extra parameter to the `FooTable.Cell#val(value, redraw, redrawSelf)` and `FooTable.Row#val(value, redraw, redrawSelf)` methods. This parameter dictates whether the row or cell updates its' own DOM when a value is set.
- Updated the `FooTable.Paging#pageSize` method to also accept string values. If the parameter is not supplied or is not a valid number the current page size is returned.
- Updated the `FooTable.Filtering#filter` method to accept a single boolean param simply called `focus`, if supplied and true the default search input receives focus after the component performs a filter operation. This new param is used internally when auto applying a query after a user types in the search input, or clicks the search/clear buttons. This behavior can be disabled by setting the new `filtering.focus` option to `false`.
- Updated the `.formatter()` function of all column types to now accept three parameters; `value`, `options` and `rowData`. `value` and `options` have always been available, the new addition is the `rowData` parameter which is an object containing the current rows' parsed values, the properties of this object match the names of the columns for the current table, if no names are specified the properties will be `col1`, `col2`, etc.
- Updated the `FooTable.HTMLColumn#sortValue` method to offload additional parsing to its `.parser()` method.
- Fixed an issue in the sorting component where values in a number column supplied as strings were being sorted as such and not as numbers as they should.
- Fixed an issue with the `FooTable.NumberColumn` where it was converting negative numbers to positive when parsing values directly from the DOM.
- Fixed the `FooTable.Table#_construct` method which was not returning a promise as it should have been doing.
- Fixes memory leak when destroying the table, properties that were holding onto references should now be cleared.

----------

### 3.1.4

- Updated the `FooTable.Table#draw` method to prevent unnecessary browser reflows and hide an unstyled flash of content during the initial loading of the table. (@jleider & @mrdziuban)
Expand Down
13 changes: 12 additions & 1 deletion compiled/footable.bootstrap.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
* @version 3.1.4
* @version 3.1.5
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down Expand Up @@ -178,13 +178,16 @@ table.footable > thead > tr.footable-filtering > th {
border-bottom-width: 1px;
font-weight: normal;
}
.footable-filtering-external.footable-filtering-right,
table.footable > thead > tr.footable-filtering > th,
table.footable.footable-filtering-right > thead > tr.footable-filtering > th {
text-align: right;
}
.footable-filtering-external.footable-filtering-left,
table.footable.footable-filtering-left > thead > tr.footable-filtering > th {
text-align: left;
}
.footable-filtering-external.footable-filtering-center,
table.footable.footable-filtering-center > thead > tr.footable-filtering > th {
text-align: center;
}
Expand All @@ -197,15 +200,18 @@ table.footable > thead > tr.footable-filtering > th div.form-group+div.form-grou
table.footable > thead > tr.footable-filtering > th div.input-group {
width: 100%;
}
.footable-filtering-external ul.dropdown-menu > li > a.checkbox,
table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox {
margin: 0;
display: block;
position: relative;
}
.footable-filtering-external ul.dropdown-menu > li > a.checkbox > label,
table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox > label {
display: block;
padding-left: 20px;
}
.footable-filtering-external ul.dropdown-menu > li > a.checkbox input[type="checkbox"],
table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox input[type="checkbox"] {
position: absolute;
margin-left: -20px;
Expand Down Expand Up @@ -261,21 +267,26 @@ table.footable-sorting-disabled th.footable-sortable:hover > span.fooicon {
opacity: 0;
visibility: hidden;
}
.footable-paging-external ul.pagination,
table.footable > tfoot > tr.footable-paging > td > ul.pagination {
margin: 10px 0 0 0;
}
.footable-paging-external span.label,
table.footable > tfoot > tr.footable-paging > td > span.label {
display: inline-block;
margin: 0 0 10px 0;
padding: 4px 10px;
}
.footable-paging-external.footable-paging-center,
table.footable > tfoot > tr.footable-paging > td,
table.footable-paging-center > tfoot > tr.footable-paging > td {
text-align: center;
}
.footable-paging-external.footable-paging-left,
table.footable-paging-left > tfoot > tr.footable-paging > td {
text-align: left;
}
.footable-paging-external.footable-paging-right,
table.footable-paging-right > tfoot > tr.footable-paging > td {
text-align: right;
}
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion compiled/footable.core.bootstrap.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
* @version 3.1.4
* @version 3.1.5
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
Loading

0 comments on commit 5a6f43b

Please sign in to comment.