mirror of
https://github.com/Mottie/tablesorter.git
synced 2024-10-08 13:44:18 +00:00
Merge branch 'master' into working
Conflicts: js/widgets/widget-chart.js
This commit is contained in:
commit
877dec004b
@ -42,7 +42,7 @@ tablesorter can successfully parse and sort many types of data including linked
|
||||
### Related Projects
|
||||
|
||||
* [Plugin for Rails](//github.com/themilkman/jquery-tablesorter-rails). Maintained by [themilkman](//github.com/themilkman).
|
||||
* [PHP templating engine for tablesorter](//github.com/alexweissman/bootsole) by [alexweissman](//github.com/alexweissman).
|
||||
* [PHP templating engine for tablesorter](//alexweissman.github.io/bootsole/) by [alexweissman](//github.com/alexweissman).
|
||||
|
||||
### Special Thanks
|
||||
|
||||
|
@ -60,11 +60,11 @@ chart = ts.chart = {
|
||||
chart.chartdata = [
|
||||
chart.headers
|
||||
];
|
||||
|
||||
|
||||
$.each(chart.rows, function(k, row) {
|
||||
chart.chartdata.push(row);
|
||||
});
|
||||
|
||||
|
||||
c.chart = {
|
||||
data: chart.chartdata
|
||||
};
|
||||
@ -81,7 +81,7 @@ chart = ts.chart = {
|
||||
chart.headers.push(c.headerContent[col]);
|
||||
});
|
||||
},
|
||||
|
||||
|
||||
getRows: function(c, wo) {
|
||||
var $table = c.$table;
|
||||
// the cache may not have a zero index if there are any
|
||||
|
Loading…
Reference in New Issue
Block a user