Merge branch 'master' into working

Conflicts:
	js/widgets/widget-chart.js
This commit is contained in:
Mottie 2015-01-31 17:35:43 -06:00
commit 877dec004b
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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