Merge remote-tracking branch 'upstream/master'

README.md

@@ -892,6 +892,7 @@ Writing a custom editor is simple. They must extend from Backbone.Form.editors.B
 ##Changelog
 
 ###master
+- Don't show <label> if schema title===false (philfreo)
 - Fix change event on radio editor (DominicBoettger)
 - Fix model errors not being return by validate() (mutewinter)
 - Setting value with setValue only from form.schema (okhomenko)

distribution.amd/backbone-forms.js

@@ -825,6 +825,11 @@ Form.Field = (function() {
 
       //Create the element
       var $field = $(templates[schema.template](this.renderingContext(schema, editor)));
+
+      //Remove <label> if it's not wanted
+      if (schema.title === false) {
+        $field.find('label[for="'+editor.id+'"]').first().remove();
+      }
 
       //Render editor
       $field.find('.bbf-tmp-editor').replaceWith(editor.render().el);

distribution/backbone-forms.js

@@ -838,6 +838,11 @@ Form.Field = (function() {
 
       //Create the element
       var $field = $(templates[schema.template](this.renderingContext(schema, editor)));
+
+      //Remove <label> if it's not wanted
+      if (schema.title === false) {
+        $field.find('label[for="'+editor.id+'"]').first().remove();
+      }
 
       //Render editor
       $field.find('.bbf-tmp-editor').replaceWith(editor.render().el);

src/field.js

@@ -102,6 +102,11 @@ Form.Field = (function() {
 
       //Create the element
       var $field = $(templates[schema.template](this.renderingContext(schema, editor)));
+
+      //Remove <label> if it's not wanted
+      if (schema.title === false) {
+        $field.find('label[for="'+editor.id+'"]').first().remove();
+      }
 
       //Render editor
       $field.find('.bbf-tmp-editor').replaceWith(editor.render().el);

test/field.js

@@ -70,6 +70,16 @@ test("'schema.title' option - Defaults to formatted version of 'key' option", fu
     equal($('label', field.el).html(), 'Camel Cased Title');
 });
 
+test("'schema.title' false option - does not render a <label>", function() {
+    var field = new Field({
+        value: 'test',
+        key: 'title',
+        schema: { title: false }
+    }).render();
+
+    equal($('label', field.el).length, 0);
+});
+
 test("'schema.help' option - Specifies help text", function() {
   var field = new Field({
     key: 'title',