diff --git a/dist/jquery.bootgrid.js b/dist/jquery.bootgrid.js index 469cc6a..1e403cb 100644 --- a/dist/jquery.bootgrid.js +++ b/dist/jquery.bootgrid.js @@ -127,7 +127,8 @@ sortable: !(data.sortable === false), // default: true visible: !(data.visible === false), // default: true width: ($.isNumeric(data.width)) ? data.width + "px" : - (typeof(data.width) === "string") ? data.width : null + (typeof(data.width) === "string") ? data.width : null, + colspan: ($.isNumeric(data.colspan) == false) ? 1 : data.colspan }; that.columns.push(column); if (column.order != null) @@ -624,7 +625,8 @@ content: (value == null || value === "") ? " " : value, css: ((column.align === "right") ? css.right : (column.align === "center") ? css.center : css.left) + cssClass, - style: (column.width == null) ? "" : "width:" + column.width + ";" })); + style: (column.width == null) ? "" : "width:" + column.width + ";", + colspan: column.colspan })); } }); @@ -785,7 +787,8 @@ column: column, icon: icon, sortable: sorting && column.sortable && css.sortable || "", css: ((align === "right") ? css.right : (align === "center") ? css.center : css.left) + cssClass, - style: (column.width == null) ? "" : "width:" + column.width + ";" })); + style: (column.width == null) ? "" : "width:" + column.width + ";" , + colspan: column.colspan})); } }); @@ -1355,10 +1358,10 @@ actionDropDownCheckboxItem: "
", actions: "", body: "", - cell: "