Skip to content

Commit

Permalink
Merge branch 'release/3.1.6' into V3
Browse files Browse the repository at this point in the history
  • Loading branch information
steveush committed Jul 18, 2017
2 parents 5a6f43b + 5f12723 commit fba11d1
Show file tree
Hide file tree
Showing 70 changed files with 90 additions and 77 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Pull requests need to be made against the [develop branch](https://github.com/fo

# Changelog #

### 3.1.6

- Fixed a critical issue with the new export feature throwing an error if Moment.js and the DateColumn were not included in the page.

### 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.
Expand Down
2 changes: 1 addition & 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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.core.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.core.min.js

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

2 changes: 1 addition & 1 deletion compiled/footable.core.standalone.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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.editing.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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.editing.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.editing.min.js

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

12 changes: 7 additions & 5 deletions compiled/footable.export.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down Expand Up @@ -138,10 +138,12 @@
return value + "";
};

// override the base method for DateColumns
F.DateColumn.prototype.stringify = function(value, options, rowData){
return F.is.object(value) && F.is.boolean(value._isAMomentObject) && value.isValid() ? value.format(this.formatString) : '';
};
if (F.is.defined(F.DateColumn)){
// override the base method for DateColumns
F.DateColumn.prototype.stringify = function(value, options, rowData){
return F.is.object(value) && F.is.boolean(value._isAMomentObject) && value.isValid() ? value.format(this.formatString) : '';
};
}

// override the base method for ObjectColumns
F.ObjectColumn.prototype.stringify = function(value, options, rowData){
Expand Down
4 changes: 2 additions & 2 deletions compiled/footable.export.min.js

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

2 changes: 1 addition & 1 deletion compiled/footable.filtering.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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.filtering.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.filtering.min.js

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

12 changes: 7 additions & 5 deletions compiled/footable.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down Expand Up @@ -7327,10 +7327,12 @@
return value + "";
};

// override the base method for DateColumns
F.DateColumn.prototype.stringify = function(value, options, rowData){
return F.is.object(value) && F.is.boolean(value._isAMomentObject) && value.isValid() ? value.format(this.formatString) : '';
};
if (F.is.defined(F.DateColumn)){
// override the base method for DateColumns
F.DateColumn.prototype.stringify = function(value, options, rowData){
return F.is.object(value) && F.is.boolean(value._isAMomentObject) && value.isValid() ? value.format(this.formatString) : '';
};
}

// override the base method for ObjectColumns
F.ObjectColumn.prototype.stringify = function(value, options, rowData){
Expand Down
4 changes: 2 additions & 2 deletions compiled/footable.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion compiled/footable.paging.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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.paging.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.paging.min.js

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

2 changes: 1 addition & 1 deletion compiled/footable.sorting.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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.sorting.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.sorting.min.js

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

2 changes: 1 addition & 1 deletion compiled/footable.standalone.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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.state.js
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.5
* @version 3.1.6
* @link http://fooplugins.com
* @copyright Steven Usher & Brad Vincent 2015
* @license Released under the GPLv3 license.
Expand Down
2 changes: 1 addition & 1 deletion compiled/footable.state.min.js

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

2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.ArrayColumn.html
Original file line number Diff line number Diff line change
Expand Up @@ -2277,7 +2277,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Breakpoint.html
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ <h5>Type:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Breakpoints.html
Original file line number Diff line number Diff line change
Expand Up @@ -2346,7 +2346,7 @@ <h5>Fires:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Cell.html
Original file line number Diff line number Diff line change
Expand Up @@ -2028,7 +2028,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Class.html
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ <h5>Example</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.ClassFactory.html
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ <h5>Parameters:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Column.html
Original file line number Diff line number Diff line change
Expand Up @@ -2179,7 +2179,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Columns.html
Original file line number Diff line number Diff line change
Expand Up @@ -2105,7 +2105,7 @@ <h5>Parameters:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Component.html
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ <h5>Parameters:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.DateColumn.html
Original file line number Diff line number Diff line change
Expand Up @@ -2474,7 +2474,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Defaults.html
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Editing.html
Original file line number Diff line number Diff line change
Expand Up @@ -3994,7 +3994,7 @@ <h5>Fires:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.EditingColumn.html
Original file line number Diff line number Diff line change
Expand Up @@ -2424,7 +2424,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Export.html
Original file line number Diff line number Diff line change
Expand Up @@ -1237,7 +1237,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Filter.html
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.Filtering.html
Original file line number Diff line number Diff line change
Expand Up @@ -4755,7 +4755,7 @@ <h5>Parameters:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.HTMLColumn.html
Original file line number Diff line number Diff line change
Expand Up @@ -2281,7 +2281,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/jsdocs/FooTable.NumberColumn.html
Original file line number Diff line number Diff line change
Expand Up @@ -2272,7 +2272,7 @@ <h5>Returns:</h5>

<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc" target="_blank">JSDoc 3.4.1</a>
on 2017-07-06T21:37:42+02:00
on 2017-07-18T22:57:29+02:00
</span>
</footer>
</div>
Expand Down
Loading

0 comments on commit fba11d1

Please sign in to comment.