Skip to content

allow fieldset with custom data-fields template #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

allow fieldset with custom data-fields template #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9f8aba
allow fieldset with custom data-fields template
0xgeert Feb 13, 2014
d469c49
build distribution
Feb 13, 2014
14753a3
Update backbone-forms.js
0xgeert Feb 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions distribution.amd/backbone-forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ Form.validators = (function() {

})();


//==================================================================================================
//FIELDSET
//==================================================================================================
Expand Down Expand Up @@ -676,11 +675,24 @@ Form.Fieldset = Backbone.View.extend({
var $container = $(el),
selection = $container.attr('data-fields');

if (_.isUndefined(selection)) return;
if (_.isUndefined(selection)) {
return;
}

//Work out which fields to include (_compact used to trim empty string selection)
var keys = _.compact((selection == '*') ? self.selectedFields || _.keys(fields) : selection.split(','));

//include all keys if not specified
if (!keys.length){
keys = _.keys(fields);
}


_.each(fields, function(field) {
$container.append(field.render().el);
//Add them
_.each(keys, function(key) {
$container.append(fields[key].render().el);
});

});

this.setElement($fieldset);
Expand Down
2 changes: 1 addition & 1 deletion distribution.amd/backbone-forms.min.js
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions distribution/backbone-forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,6 @@ Form.validators = (function() {

})();


//==================================================================================================
//FIELDSET
//==================================================================================================
Expand Down Expand Up @@ -690,10 +689,19 @@ Form.Fieldset = Backbone.View.extend({
selection = $container.attr('data-fields');

if (_.isUndefined(selection)) return;

//Work out which fields to include (_compact used to trim empty string selection)
var keys = _.compact((selection == '*') ? self.selectedFields || _.keys(fields) : selection.split(','));

//include all keys if not specified
if (!keys.length)
keys = _.keys(fields);

_.each(fields, function(field) {
$container.append(field.render().el);
//Add them
_.each(keys, function(key) {
$container.append(fields[key].render().el);
});

});

this.setElement($fieldset);
Expand Down
2 changes: 1 addition & 1 deletion distribution/backbone-forms.min.js
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 12 additions & 4 deletions src/fieldset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

//==================================================================================================
//FIELDSET
//==================================================================================================
Expand Down Expand Up @@ -87,10 +86,19 @@ Form.Fieldset = Backbone.View.extend({
selection = $container.attr('data-fields');

if (_.isUndefined(selection)) return;

_.each(fields, function(field) {
$container.append(field.render().el);

//Work out which fields to include (_compact used to trim empty string selection)
var keys = _.compact((selection == '*') ? self.selectedFields || _.keys(fields) : selection.split(','));

//include all keys if not specified
if (!keys.length)
keys = _.keys(fields);

//Add them
_.each(keys, function(key) {
$container.append(fields[key].render().el);
});

});

this.setElement($fieldset);
Expand Down