diff --git a/.gitignore b/.gitignore
index 1cc5b6e..cd945ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ src/*.map
*.diff
*.patch
.DS_Store
-settings.json
\ No newline at end of file
+settings.json
+bower_components
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c5e48..7bbaf98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,53 @@
# Changelog
+## Unreleased
+
+### Enhancements & Features
+- Add `defaultRowCount` property to set default row count from rowCount array
+- Add `sort` event; triggered when column is sorted
+- Add `searchSettings.highlightResults` option to wrap matching substrings that match the query in result set
+ - Add `highlightResults` css class to options
+ - Add `highlightResults` template which wraps the matched substring
+
+## 1.4.3
+
+### Enhancements & Features
+- Updated search to pass row, column, and grid to converter
+- Add derived cell support with a derived formatter
+ - Adds additional `sortKey` parameter to determine which reference should be considered for sorting
+- Add `sortRendered` parameter that uses the rendered cell value as the comparator
+ - Useful is situations where the formatter expects values other than what you want to sort on
+- Add `derived` formatter and converter to defaults
+
+## 1.4.2
+
+### Bug Fixes
+- Fixed bug with showing/hiding columns
+
+### Enhancements & Features
+- Added options for search to include hidden columns
+
+## 1.4.1
+
+### Bug Fixes
+- Fixed toggleColumn event being fired twice in some cases
+
+## 1.4.0
+
+### Enhancements & Features
+- Added 4 new events
+ - **search** Fired when a search is executed
+ - **changePage** Fired when pagination is clicked
+ - **toggleColumn** Fired when the checkbox is clicked to show/hide a column
+ - **changeRowCount** Fired when changing the row count
+- Added function that resolves the relative page the table show display after changing row count.
+- Added option to disable the feature to resolve relative page after changing row count. `resolvePageFromRowCount: {boolean} [true]`
+
+## 1.3.2
+
+### Enhancements & Features
+- Sorting columns now respects the `caseSensitive` flag.
+
## 1.3.1
### Enhancements & Features
@@ -102,4 +150,4 @@ There are no breaking changes but some HTML templates changed during development
## 0.9.7
### Bug Fixes
-- Fixed a column header visualization bug regarding sorting
\ No newline at end of file
+- Fixed a column header visualization bug regarding sorting
diff --git a/Gruntfile.js b/Gruntfile.js
index e584c33..f9e9e4f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -55,7 +55,7 @@ module.exports = function (grunt)
scripts: {
options: {
separator: '\r\n\r\n',
- banner: '<%= banner %>;(function ($, window, undefined)\r\n{\r\n /*jshint validthis: true */\r\n "use strict";\r\n\r\n',
+ banner: '<%= banner %>;(function ($, window, undefined)\r\n{\r\n /*jshint validthis: true, latedef: false */\r\n "use strict";\r\n\r\n',
footer: '\r\n})(jQuery, window);',
process: function(src, filepath)
{
@@ -210,7 +210,7 @@ module.exports = function (grunt)
files: [
{
flatten: true,
- expand: true,
+ expand: true,
src: ['<%= folders.dist %>/*.js', '<%= folders.dist %>/*.css'], dest: '/'
}
]
@@ -259,4 +259,4 @@ module.exports = function (grunt)
grunt.registerTask('build', ['clean:build', 'version', 'less', 'concat', 'csslint', 'jshint', 'test']);
grunt.registerTask('release', ['build', 'api', 'cssmin', 'uglify', 'compress', 'nugetpack']);
grunt.registerTask('publish', ['nugetpush', 'exec:publish']);
-};
\ No newline at end of file
+};
diff --git a/bower.json b/bower.json
index 856e916..45fbf86 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
"accessibility",
"bootstrap"
],
- "version": "1.3.1",
+ "version": "1.4.2",
"authors": [
{
"name": "Rafael Staib",
diff --git a/demo/ajax.htm b/demo/ajax.htm
new file mode 100644
index 0000000..befe92a
--- /dev/null
+++ b/demo/ajax.htm
@@ -0,0 +1,118 @@
+
+
+
+
+
+ jQuery Bootgrid Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | ID |
+ Sender |
+ Received |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demo/append.html b/demo/append.html
new file mode 100644
index 0000000..be57c0c
--- /dev/null
+++ b/demo/append.html
@@ -0,0 +1,157 @@
+
+
+
+
+
+ jQuery Bootgrid Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | ID |
+
+
+
+ | 1111 |
+ | 2222 |
+ | 3333 |
+ | 11111 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demo/data.json b/demo/data.json
deleted file mode 100644
index b177807..0000000
--- a/demo/data.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "current": 1,
- "rowCount": 5,
- "rows": [
- {
- "id": "a0e3a286-4343-4240-8d6d-e79fa2e94b4c",
- "sender": "test@test.de",
- "received": "2014-04-17 15:08:03Z"
- },
- {
- "id": "dd9f2d42-9442-404c-8d2a-dd3bd2156c03",
- "sender": "test@test.de",
- "received": "2014-04-16 15:19:31Z"
- },
- {
- "id": "e9b8ede5-c1bf-4d90-b724-e7379b25f7b3",
- "sender": "test@test.de",
- "received": "2014-04-16 15:17:05Z"
- },
- {
- "id": "153d3acb-efe7-4b5f-a3a9-e8ac18bdec30",
- "sender": "test@test.de",
- "received": "2014-04-16 15:17:05Z"
- },
- {
- "id": "49bad60a-bbf7-42bf-b040-d901805ccbf1",
- "sender": "test@test.de",
- "received": "2014-04-15 11:23:06Z"
- }
- ],
- "total": 5
-}
\ No newline at end of file
diff --git a/demo/data1.json b/demo/data1.json
new file mode 100644
index 0000000..e33e8aa
--- /dev/null
+++ b/demo/data1.json
@@ -0,0 +1,26 @@
+{
+ "current": 1,
+ "rowCount": 5,
+ "rows": [{
+ "id": "a0e3a286-4343-4240-8d6d-e79fa2e94b4c",
+ "sender": "test@test.de",
+ "received": "2014-04-17 15:08:03Z"
+ }, {
+ "id": "dd9f2d42-9442-404c-8d2a-dd3bd2156c03",
+ "sender": "test@test.de",
+ "received": "2014-04-16 15:19:31Z"
+ }, {
+ "id": "e9b8ede5-c1bf-4d90-b724-e7379b25f7b3",
+ "sender": "test@test.de",
+ "received": "2014-04-16 15:17:05Z"
+ }, {
+ "id": "153d3acb-efe7-4b5f-a3a9-e8ac18bdec30",
+ "sender": "test@test.de",
+ "received": "2014-04-16 15:17:05Z"
+ }, {
+ "id": "49bad60a-bbf7-42bf-b040-d901805ccbf1",
+ "sender": "test@test.de",
+ "received": "2014-04-15 11:23:06Z"
+ }],
+ "total": 10
+}
diff --git a/demo/data2.json b/demo/data2.json
new file mode 100644
index 0000000..35cfbc2
--- /dev/null
+++ b/demo/data2.json
@@ -0,0 +1,26 @@
+{
+ "current": 2,
+ "rowCount": 5,
+ "rows": [{
+ "id": "V5e3a286-4343-4240-8d6d-e79fa2e94b4c",
+ "sender": "test@test.de",
+ "received": "2014-04-17 15:08:03Z"
+ }, {
+ "id": "pp9f2d42-9442-404c-8d2a-dd3bd2156c03",
+ "sender": "test@test.de",
+ "received": "2014-04-16 15:19:31Z"
+ }, {
+ "id": "p7b8ede5-c1bf-4d90-b724-e7379b25f7b3",
+ "sender": "test@test.de",
+ "received": "2014-04-16 15:17:05Z"
+ }, {
+ "id": "553d3acb-efe7-4b5f-a3a9-e8ac18bdec30",
+ "sender": "test@test.de",
+ "received": "2014-04-16 15:17:05Z"
+ }, {
+ "id": "34bad60a-bbf7-42bf-b040-d901805ccbf1",
+ "sender": "test@test.de",
+ "received": "2014-04-15 11:23:06Z"
+ }],
+ "total": 10
+}
diff --git a/demo/dataFunc.htm b/demo/dataFunc.htm
new file mode 100644
index 0000000..4731695
--- /dev/null
+++ b/demo/dataFunc.htm
@@ -0,0 +1,137 @@
+
+
+
+
+
+ jQuery Bootgrid Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | ID |
+ Sender |
+ Received |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demo/derived.htm b/demo/derived.htm
new file mode 100644
index 0000000..a1fc66c
--- /dev/null
+++ b/demo/derived.htm
@@ -0,0 +1,284 @@
+
+
+
+
+
+ jQuery Bootgrid Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | ID |
+ Name |
+ Sender |
+ Received |
+ Company |
+ Cost |
+ Derived |
+ Hidden |
+
+
+
+
+ | 1 |
+ Aimee Delaney |
+ |
+ 03.06.16 |
+ Maecenas Malesuada Foundation |
+ 222222 |
+ |
+ C9F35176-EE9C-7DA5-DB47-5B62C57AA176 |
+
+
+ | 2 |
+ {"text": "BORIS BULE", "url": "http://www.zzz.ca"} |
+ vitae.diam@Proinultrices.edu |
+ 10.12.16 |
+ Ac Corporation |
+ 11111111 |
+ |
+ 1BC83AA2-0979-C426-A3B4-4CC4F8B0CFF9 |
+
+
+ | 3 |
+ {"text": "ALEX Reese", "url": "http://www.ccc.com"} |
+ mauris.sit.amet@nonmassa.ca |
+ 27.06.17 |
+ Nulla At Incorporated |
+ 333333333 |
+ |
+ C3CF97AE-0E0E-EA4E-FBF5-A63444134B8E |
+
+
+ | 4 |
+ {"text": "Juliet Mcfarland", "url": "http://www.eee.com"} |
+ egestas.Duis.ac@eu.net |
+ 02.07.16 |
+ Nisi Sem Semper Limited |
+ 555555 |
+ |
+ 33AC322B-8AB4-B9F0-FAF0-BD69A7937627 |
+
+
+ | 5 |
+ {"url": "http://www.ddd.com", "text": "Aaron Weaver"} |
+ Curabitur@fermentumconvallisligula.org |
+ 07.06.17 |
+ Magna Nec Quam Industries |
+ 4444444 |
+ |
+ 235B6F73-2150-A423-DC0A-A75C74669824 |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demo/index.htm b/demo/index.htm
index ae13225..a35686e 100644
--- a/demo/index.htm
+++ b/demo/index.htm
@@ -1,278 +1,564 @@
-
+
-
-
-
- jQuery Bootgrid Demo
-
-
-
-
-
-
-