Added new events and minor fixes/improvements

Author: Iodine-

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.4.0
+
+### Enhancements & Features
+- Added 3 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

bower.json

@@ -13,7 +13,7 @@
 		"accessibility",
 		"bootstrap"
 	],
-	"version": "1.3.2",
+	"version": "1.4.0",
 	"authors": [{
 		"name": "Rafael Staib",
 		"email": "me@rafaelstaib.com",

demo/index.htm

@@ -249,7 +249,7 @@
                             </tr>
                             <tr>
                                 <td>18</td>
-                                <td>Riley Vance</td>
+                                <td>2</td>
                                 <td>porttitor.interdum@pharetra.edu</td>
                                 <td>19.06.16</td>
                                 <td>Elit Nulla Facilisi Inc.</td>
@@ -258,7 +258,7 @@
                             </tr>
                             <tr>
                                 <td>19</td>
-                                <td>Neve Owen</td>
+                                <td>11</td>
                                 <td>nunc.sed.pede@lectusrutrum.edu</td>
                                 <td>15.11.15</td>
                                 <td>Leo Morbi Incorporated</td>
@@ -267,7 +267,7 @@
                             </tr>
                             <tr>
                                 <td>20</td>
-                                <td>Fredericka Turner</td>
+                                <td>01</td>
                                 <td>nulla.magna.malesuada@musProin.edu</td>
                                 <td>30.01.17</td>
                                 <td>Ac Urna Corp.</td>
@@ -479,7 +479,7 @@
                             }
                         },
                         caseSensitive: false,
-                        rowCount: [-1, 10, 50, 75]
+                        rowCount: [-1, 5, 10, 15]
                     });
                 }
 

dist/jquery.bootgrid.css

@@ -1,5 +1,5 @@
 /*! 
- * jQuery Bootgrid v1.3.1 - 08/04/2016
+ * jQuery Bootgrid v1.3.2 - 08/09/2016
  * Copyright (c) 2014-2016 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
  */

dist/jquery.bootgrid.fa.js

@@ -1,5 +1,5 @@
 /*! 
- * jQuery Bootgrid v1.3.1 - 08/04/2016
+ * jQuery Bootgrid v1.3.2 - 08/09/2016
  * Copyright (c) 2014-2016 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
  */

dist/jquery.bootgrid.js

@@ -1,5 +1,5 @@
 /*! 
- * jQuery Bootgrid v1.3.1 - 08/04/2016
+ * jQuery Bootgrid v1.3.2 - 08/09/2016
  * Copyright (c) 2014-2016 Rafael Staib (http://www.jquery-bootgrid.com)
  * Licensed under MIT http://www.opensource.org/licenses/MIT
  */
@@ -362,6 +362,7 @@ function renderColumnSelection(actions) {
 							checkbox = $this.find(checkboxSelector);
 						if (!checkbox.prop("disabled")) {
 							column.visible = checkbox.prop("checked");
+							that.element.trigger('toggleColumn', [column.id, column.text, column.visible]);
 							var enable = that.columns.where(isVisible).length > 1;
 							$this.parents(itemsSelector).find(selector + ":has(" + checkboxSelector + ":checked)")
 								._bgEnableAria(enable).find(checkboxSelector)._bgEnableField(enable);
@@ -478,6 +479,7 @@ function renderPaginationItem(list, page, text, markerCss) {
 				};
 				var command = $this.data("page");
 				that.current = commandList[command] || command;
+				that.element.trigger('changePage', [command.toString(), that.current]);
 				loadData.call(that);
 			}
 			$this.trigger("blur");
@@ -518,15 +520,22 @@ function renderRowCountSelection(actions) {
 					var $this = $(this),
 						newRowCount = $this.data("action");
 					if (newRowCount !== that.rowCount) {
-						// todo: sophisticated solution needed for calculating which page is selected
-						that.current = 1; // that.rowCount === -1 ---> All
+						if(that.options.resolvePageFromRowCount){
+							var page = that.current > 1 ? that.current : 1;
+							var skip = that.current > 1 ? that.rowCount * (that.current-1) + 1 : 0;
+							var newPage = skip > 1 ? Math.ceil(skip/newRowCount) : 1;
+							that.current = newRowCount > 0 ? newPage : 1;
+						}else{
+							that.current = 1;
+						}
 						that.rowCount = newRowCount;
 						$this.parents(menuItemsSelector).children().each(function() {
 							var $item = $(this),
 								currentRowCount = $item.find(menuItemSelector).data("action");
 							$item._bgSelectAria(currentRowCount === newRowCount);
 						});
 						$this.parents(menuSelector).find(menuTextSelector).text(getText(newRowCount));
+						that.element.trigger('changeRowCount' + namespace, [newRowCount]);
 						loadData.call(that);
 					}
 				});
@@ -692,6 +701,7 @@ function executeSearch(phrase) {
 	if (this.searchPhrase !== phrase) {
 		this.current = 1;
 		this.searchPhrase = phrase;
+		this.element.trigger("search" + namespace, [this.searchPhrase]);
 		loadData.call(this);
 	}
 }
@@ -935,6 +945,17 @@ Grid.defaults = {
     columnSelection: true,
     rowCount: [10, 25, 50, -1], // rows per page int or array of int (-1 represents "All")
 
+    /**
+     * Resolves the correct page number after changing the row count so that the top most row will remain in the table
+     *
+     * @property resolvePageFromRowCount
+     * @type Boolean
+     * @default true
+     * @for defaults
+     * @since 1.4.0
+     **/
+    resolvePageFromRowCount: true,
+
     /**
      * Enables row selection (to enable multi selection see also `multiSelect`). Default value is `false`.
      *
@@ -1609,12 +1630,25 @@ Grid.prototype.sort = function(dictionary)
  * Therefore be sure that only one grid instance is catched by your selector.
  *
  * @method getColumnSettings
+ * @param {Object} filter object to filter return array with
  * @return {Array} Returns a list of the column settings.
  * @since 1.2.0
+ * @version 1.4.0
  **/
-Grid.prototype.getColumnSettings = function()
+Grid.prototype.getColumnSettings = function(filter)
 {
-    return $.merge([], this.columns);
+    var res = this.columns;
+    if(filter && typeof filter === 'object'){
+        res = this.columns.filter(function(el){
+            for (var key in filter) {
+                if(el[key] !== filter[key]){
+                    return false;
+                }
+            }
+            return true;
+        });
+    }
+    return $.merge([], res);
 };
 
 /**

package.json

@@ -2,7 +2,7 @@
 	"name": "jquery-bootgrid",
 	"namespace": "jquery.bootgrid",
 	"title": "jQuery Bootgrid",
-	"version": "1.3.2",
+	"version": "1.4.0",
 	"description": "Nice, sleek and intuitive. A grid control especially designed for bootstrap.",
 	"homepage": "http://www.jquery-bootgrid.com",
 	"author": {

src/internal.js

@@ -352,6 +352,7 @@ function renderColumnSelection(actions) {
 							checkbox = $this.find(checkboxSelector);
 						if (!checkbox.prop("disabled")) {
 							column.visible = checkbox.prop("checked");
+							that.element.trigger('toggleColumn', [column.id, column.text, column.visible]);
 							var enable = that.columns.where(isVisible).length > 1;
 							$this.parents(itemsSelector).find(selector + ":has(" + checkboxSelector + ":checked)")
 								._bgEnableAria(enable).find(checkboxSelector)._bgEnableField(enable);
@@ -468,6 +469,7 @@ function renderPaginationItem(list, page, text, markerCss) {
 				};
 				var command = $this.data("page");
 				that.current = commandList[command] || command;
+				that.element.trigger('changePage', [command.toString(), that.current]);
 				loadData.call(that);
 			}
 			$this.trigger("blur");
@@ -508,15 +510,22 @@ function renderRowCountSelection(actions) {
 					var $this = $(this),
 						newRowCount = $this.data("action");
 					if (newRowCount !== that.rowCount) {
-						// todo: sophisticated solution needed for calculating which page is selected
-						that.current = 1; // that.rowCount === -1 ---> All
+						if(that.options.resolvePageFromRowCount){
+							var page = that.current > 1 ? that.current : 1;
+							var skip = that.current > 1 ? that.rowCount * (that.current-1) + 1 : 0;
+							var newPage = skip > 1 ? Math.ceil(skip/newRowCount) : 1;
+							that.current = newRowCount > 0 ? newPage : 1;
+						}else{
+							that.current = 1;
+						}
 						that.rowCount = newRowCount;
 						$this.parents(menuItemsSelector).children().each(function() {
 							var $item = $(this),
 								currentRowCount = $item.find(menuItemSelector).data("action");
 							$item._bgSelectAria(currentRowCount === newRowCount);
 						});
 						$this.parents(menuSelector).find(menuTextSelector).text(getText(newRowCount));
+						that.element.trigger('changeRowCount' + namespace, [newRowCount]);
 						loadData.call(that);
 					}
 				});
@@ -682,6 +691,7 @@ function executeSearch(phrase) {
 	if (this.searchPhrase !== phrase) {
 		this.current = 1;
 		this.searchPhrase = phrase;
+		this.element.trigger("search" + namespace, [this.searchPhrase]);
 		loadData.call(this);
 	}
 }

src/public.js

@@ -61,6 +61,17 @@ Grid.defaults = {
     columnSelection: true,
     rowCount: [10, 25, 50, -1], // rows per page int or array of int (-1 represents "All")
 
+    /**
+     * Resolves the correct page number after changing the row count so that the top most row will remain in the table
+     *
+     * @property resolvePageFromRowCount
+     * @type Boolean
+     * @default true
+     * @for defaults
+     * @since 1.4.0
+     **/
+    resolvePageFromRowCount: true,
+
     /**
      * Enables row selection (to enable multi selection see also `multiSelect`). Default value is `false`.
      *
@@ -735,12 +746,25 @@ Grid.prototype.sort = function(dictionary)
  * Therefore be sure that only one grid instance is catched by your selector.
  *
  * @method getColumnSettings
+ * @param {Object} filter object to filter return array with
  * @return {Array} Returns a list of the column settings.
  * @since 1.2.0
+ * @version 1.4.0
  **/
-Grid.prototype.getColumnSettings = function()
+Grid.prototype.getColumnSettings = function(filter)
 {
-    return $.merge([], this.columns);
+    var res = this.columns;
+    if(filter && typeof filter === 'object'){
+        res = this.columns.filter(function(el){
+            for (var key in filter) {
+                if(el[key] !== filter[key]){
+                    return false;
+                }
+            }
+            return true;
+        });
+    }
+    return $.merge([], res);
 };
 
 /**