Skip to content
This repository was archived by the owner on Apr 2, 2019. It is now read-only.

Commit 3fd4c14

Browse files
committed
Merge branch 'jacobcase-issue561'
2 parents caada9e + d6ed1a0 commit 3fd4c14

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

lib/backgrid.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
backgrid 0.3.5
33
http://github.com/wyuenho/backgrid
44
5-
Copyright (c) 2016 Jimmy Yuen Ho Wong and contributors <wyuenho@gmail.com>
5+
Copyright (c) 2015 Jimmy Yuen Ho Wong and contributors <wyuenho@gmail.com>
66
Licensed under the MIT license.
77
*/
88

@@ -2305,7 +2305,7 @@ var Body = Backgrid.Body = Backbone.View.extend({
23052305
this.columns = new Columns(this.columns);
23062306
}
23072307

2308-
this.row = options.row || Row;
2308+
this.row = options.row || this.row || Row;
23092309
this.rows = this.collection.map(function (model) {
23102310
var row = new this.row({
23112311
columns: this.columns,
@@ -2904,4 +2904,4 @@ var Grid = Backgrid.Grid = Backbone.View.extend({
29042904

29052905
});
29062906
return Backgrid;
2907-
}));
2907+
}));

src/body.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var Body = Backgrid.Body = Backbone.View.extend({
3939
this.columns = new Columns(this.columns);
4040
}
4141

42-
this.row = options.row || Row;
42+
this.row = options.row || this.row || Row;
4343
this.rows = this.collection.map(function (model) {
4444
var row = new this.row({
4545
columns: this.columns,

0 commit comments

Comments
 (0)