Skip to content

Commit c6994af

Browse files
author
kevinparkerson
committed
Release 2.4.2
1 parent bd1e9f5 commit c6994af

8 files changed

+30
-13
lines changed

dist/all.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -2828,7 +2828,7 @@ define('fuelux/datagrid',['require','jquery'],function (require) {
28282828
constructor: Datagrid,
28292829

28302830
renderColumns: function () {
2831-
var self = this;
2831+
var $target;
28322832

28332833
this.$footer.attr('colspan', this.columns.length);
28342834
this.$topheader.attr('colspan', this.columns.length);
@@ -2841,7 +2841,12 @@ define('fuelux/datagrid',['require','jquery'],function (require) {
28412841
colHTML += '>' + column.label + '</th>';
28422842
});
28432843

2844-
self.$colheader.append(colHTML);
2844+
this.$colheader.append(colHTML);
2845+
2846+
if (this.options.dataOptions.sortProperty) {
2847+
$target = this.$colheader.children('th[data-property="' + this.options.dataOptions.sortProperty + '"]');
2848+
this.updateColumns($target, this.options.dataOptions.sortDirection);
2849+
}
28452850
},
28462851

28472852
updateColumns: function ($target, direction) {

dist/all.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/fuelux.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/datagrid.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ define(['require','jquery'],function (require) {
8585
constructor: Datagrid,
8686

8787
renderColumns: function () {
88-
var self = this;
88+
var $target;
8989

9090
this.$footer.attr('colspan', this.columns.length);
9191
this.$topheader.attr('colspan', this.columns.length);
@@ -98,7 +98,12 @@ define(['require','jquery'],function (require) {
9898
colHTML += '>' + column.label + '</th>';
9999
});
100100

101-
self.$colheader.append(colHTML);
101+
this.$colheader.append(colHTML);
102+
103+
if (this.options.dataOptions.sortProperty) {
104+
$target = this.$colheader.children('th[data-property="' + this.options.dataOptions.sortProperty + '"]');
105+
this.updateColumns($target, this.options.dataOptions.sortDirection);
106+
}
102107
},
103108

104109
updateColumns: function ($target, direction) {

dist/fuelux.zip

257 Bytes
Binary file not shown.

dist/less/tree.less

+4-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@
6464
}
6565

6666
.tree-item-name {
67-
position: absolute;
68-
left: 29px;
67+
overflow: hidden;
68+
padding-left: 29px;
69+
text-overflow: ellipsis;
70+
white-space: nowrap;
6971
}
7072

7173
.tree-dot {

dist/loader.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -3169,7 +3169,7 @@ define('fuelux/datagrid',['require','jquery'],function (require) {
31693169
constructor: Datagrid,
31703170

31713171
renderColumns: function () {
3172-
var self = this;
3172+
var $target;
31733173

31743174
this.$footer.attr('colspan', this.columns.length);
31753175
this.$topheader.attr('colspan', this.columns.length);
@@ -3182,7 +3182,12 @@ define('fuelux/datagrid',['require','jquery'],function (require) {
31823182
colHTML += '>' + column.label + '</th>';
31833183
});
31843184

3185-
self.$colheader.append(colHTML);
3185+
this.$colheader.append(colHTML);
3186+
3187+
if (this.options.dataOptions.sortProperty) {
3188+
$target = this.$colheader.children('th[data-property="' + this.options.dataOptions.sortProperty + '"]');
3189+
this.updateColumns($target, this.options.dataOptions.sortDirection);
3190+
}
31863191
},
31873192

31883193
updateColumns: function ($target, direction) {

dist/loader.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)