Merge branch 'master' of github.com:okfn/recline

This commit is contained in:
Rufus Pollock
2012-10-19 08:00:51 +01:00
5 changed files with 179 additions and 74 deletions

View File

@@ -31,7 +31,9 @@ test('state', function () {
columnsOrder:['lon','id','z','date', 'y', 'country'],
columnsWidth:[
{column:'id',width: 250}
]
],
gridOptions: {editable: true},
columnsEditor: [{column: 'country', editor: Slick.Editors.Text}]
}
});
$('.fixtures .test-datatable').append(view.el);
@@ -54,9 +56,51 @@ test('state', function () {
// Column width
equal($('.slick-header-column[title="id"]').width(),250);
// Editable grid
equal(true, view.grid.getOptions().editable);
// Editor on 'country' column
var countryColumn = _.find(view.grid.getColumns(), function (c) { return c.field == 'country'; });
equal(Slick.Editors.Text, countryColumn.editor);
view.remove();
});
test('editable', function () {
var dataset = Fixture.getDataset();
var view = new recline.View.SlickGrid({
model: dataset,
state: {
hiddenColumns:['x','lat','title'],
columnsOrder:['lon','id','z','date', 'y', 'country'],
columnsWidth:[
{column:'id',width: 250}
],
gridOptions: {editable: true},
columnsEditor: [{column: 'country', editor: Slick.Editors.Text}]
}
});
$('.fixtures .test-datatable').append(view.el);
view.render();
view.grid.init();
var new_item = {lon: "foo", id: 1, z: 23, date: "12", y: 3, country: 'FR'};
dataset.records.on('change', function(record){
equal(new_item['lon'], record.get('lon'));
});
// Be sure a cell change triggers a change of the model
e = new Slick.EventData();
return view.grid.onCellChange.notify({
row: 1,
cell: 0,
item: new_item,
grid: view.grid
}, e, view.grid);
});
test('renderers', function () {
var dataset = Fixture.getDataset();