Distribution

powmedia · Oct 12, 2012 · c21243c · c21243c
1 parent 95e906d
commit c21243c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -917,6 +917,7 @@ Writing a custom editor is simple. They must extend from Backbone.Form.editors.B
 
 
 ###0.10.0
+- Fields with options, such as Select, should handle 0 as value (torbjorntorbjorn)
 - Update backbone.bootstrap-modal adapter
 - Refactor rendering.
     - <legend> tags are now defined in the template.

diff --git a/distribution.amd/backbone-forms.js b/distribution.amd/backbone-forms.js
@@ -1541,7 +1541,7 @@ Form.editors = (function() {
       //Generate HTML
       _.each(array, function(option) {
         if (_.isObject(option)) {
-          var val = option.val ? option.val : '';
+          var val = (option.val || option.val === 0) ? option.val : '';
           html.push('<option value="'+val+'">'+option.label+'</option>');
         }
         else {
@@ -1627,7 +1627,7 @@ Form.editors = (function() {
       _.each(array, function(option, index) {
         var itemHtml = '<li>';
         if (_.isObject(option)) {
-          var val = option.val ? option.val : '';
+          var val = (option.val || option.val === 0) ? option.val : '';
           itemHtml += ('<input type="radio" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />')
           itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>')
         }
@@ -1715,7 +1715,7 @@ Form.editors = (function() {
       _.each(array, function(option, index) {
         var itemHtml = '<li>';
         if (_.isObject(option)) {
-          var val = option.val ? option.val : '';
+          var val = (option.val || option.val === 0) ? option.val : '';
           itemHtml += ('<input type="checkbox" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />')
           itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>')
         }

diff --git a/distribution.amd/backbone-forms.min.js b/distribution.amd/backbone-forms.min.js
diff --git a/distribution/backbone-forms.js b/distribution/backbone-forms.js
@@ -1554,7 +1554,7 @@ Form.editors = (function() {
       //Generate HTML
       _.each(array, function(option) {
         if (_.isObject(option)) {
-          var val = option.val ? option.val : '';
+          var val = (option.val || option.val === 0) ? option.val : '';
           html.push('<option value="'+val+'">'+option.label+'</option>');
         }
         else {
@@ -1640,7 +1640,7 @@ Form.editors = (function() {
       _.each(array, function(option, index) {
         var itemHtml = '<li>';
         if (_.isObject(option)) {
-          var val = option.val ? option.val : '';
+          var val = (option.val || option.val === 0) ? option.val : '';
           itemHtml += ('<input type="radio" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />')
           itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>')
         }
@@ -1728,7 +1728,7 @@ Form.editors = (function() {
       _.each(array, function(option, index) {
         var itemHtml = '<li>';
         if (_.isObject(option)) {
-          var val = option.val ? option.val : '';
+          var val = (option.val || option.val === 0) ? option.val : '';
           itemHtml += ('<input type="checkbox" name="'+self.id+'" value="'+val+'" id="'+self.id+'-'+index+'" />')
           itemHtml += ('<label for="'+self.id+'-'+index+'">'+option.label+'</label>')
         }

diff --git a/distribution/backbone-forms.min.js b/distribution/backbone-forms.min.js