|
@@ -312,8 +312,7 @@
|
|
|
};
|
|
};
|
|
|
$.each(this.options.columns, function (i, column) {
|
|
$.each(this.options.columns, function (i, column) {
|
|
|
var text = '',
|
|
var text = '',
|
|
|
- style = sprintf('text-align: %s; ', column.align) +
|
|
|
|
|
- sprintf('vertical-align: %s; ', column.valign),
|
|
|
|
|
|
|
+ style = '',
|
|
|
class_ = sprintf(' class="%s"', column['class']),
|
|
class_ = sprintf(' class="%s"', column['class']),
|
|
|
order = that.options.sortOrder || column.order;
|
|
order = that.options.sortOrder || column.order;
|
|
|
|
|
|
|
@@ -321,6 +320,10 @@
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ style = sprintf('text-align: %s; ', column.halign ? column.halign : column.align);
|
|
|
|
|
+ style += sprintf('vertical-align: %s; ', column.valign);
|
|
|
|
|
+ style += sprintf('width: %spx; ', column.checkbox || column.radio ? 36 : column.width);
|
|
|
|
|
+
|
|
|
visibleColumns.push(column);
|
|
visibleColumns.push(column);
|
|
|
that.header.fields.push(column.field);
|
|
that.header.fields.push(column.field);
|
|
|
that.header.styles.push(style);
|
|
that.header.styles.push(style);
|
|
@@ -331,12 +334,6 @@
|
|
|
that.header.cellStyles.push(column.cellStyle);
|
|
that.header.cellStyles.push(column.cellStyle);
|
|
|
that.header.clickToSelects.push(column.clickToSelect);
|
|
that.header.clickToSelects.push(column.clickToSelect);
|
|
|
|
|
|
|
|
- if (column.halign) {
|
|
|
|
|
- style = sprintf('text-align: %s; ', column.halign) +
|
|
|
|
|
- sprintf('vertical-align: %s; ', column.valign);
|
|
|
|
|
- }
|
|
|
|
|
- style += sprintf('width: %spx; ', column.checkbox || column.radio ? 36 : column.width);
|
|
|
|
|
-
|
|
|
|
|
html.push('<th',
|
|
html.push('<th',
|
|
|
column.checkbox || column.radio ?
|
|
column.checkbox || column.radio ?
|
|
|
sprintf(' class="bs-checkbox %s"', column['class'] || '') :
|
|
sprintf(' class="bs-checkbox %s"', column['class'] || '') :
|