Merge pull request #92 from gobuffalo/development

Infinite Loop Fix and Cleanup

Author: paganotoni

form/bootstrap/form.go

@@ -44,7 +44,7 @@ func (f Form) RadioButton(opts tags.Options) *tags.Tag {
 //RadioButtonTag builds a bootstrap input[type=radio] with passed options
 func (f Form) RadioButtonTag(opts tags.Options) *tags.Tag {
 	return divWrapper(opts, func(o tags.Options) tags.Body {
-		return f.Form.RadioButton(o)
+		return f.Form.RadioButtonTag(o)
 	})
 }
 
@@ -63,7 +63,7 @@ func (f Form) TextArea(opts tags.Options) *tags.Tag {
 //TextAreaTag builds a bootstrap textarea with passed options
 func (f Form) TextAreaTag(opts tags.Options) *tags.Tag {
 	return divWrapper(opts, func(o tags.Options) tags.Body {
-		return f.Form.TextArea(o)
+		return f.Form.TextAreaTag(o)
 	})
 }
 

form/form_for.go

@@ -3,7 +3,6 @@ package form
 import (
 	"database/sql/driver"
 	"fmt"
-	"log"
 	"reflect"
 	"strings"
 	"sync"
@@ -127,14 +126,13 @@ func (f FormFor) addFormatTag(field string, opts tags.Options) {
 
 //RadioButton creates a radio button for a struct field
 func (f FormFor) RadioButton(field string, opts tags.Options) *tags.Tag {
-	// log.Println("[Warning] RadioButton is deprecated and may be removed in the future, use RadioButtonTag instead")
-	return f.RadioButton(field, opts)
+	return f.RadioButtonTag(field, opts)
 }
 
 //RadioButtonTag creates a radio button for a struct field
 func (f FormFor) RadioButtonTag(field string, opts tags.Options) *tags.Tag {
 	f.buildOptions(field, opts)
-	return f.Form.RadioButton(opts)
+	return f.Form.RadioButtonTag(opts)
 }
 
 //SelectTag creates a select tag for a specified struct field and loads options from the options opject
@@ -145,7 +143,6 @@ func (f FormFor) SelectTag(field string, opts tags.Options) *SelectTag {
 
 //TextArea creates text area for the specified struct field
 func (f FormFor) TextArea(field string, opts tags.Options) *tags.Tag {
-	log.Println("[Warning] TextArea is deprecated and may be removed in the future, use TextAreaTag instead")
 	return f.TextAreaTag(field, opts)
 }
 

form/radio_button_tag.go

@@ -10,7 +10,6 @@ import (
 
 //RadioButton creates a radio button for a form with the passed options
 func (f Form) RadioButton(opts tags.Options) *tags.Tag {
-	// log.Println("[Warning] RadioButton is deprecated and may be removed in the future, use RadioButtonTag instead")
 	return f.RadioButtonTag(opts)
 }
 

form/text_area_tag.go

@@ -6,7 +6,6 @@ import (
 
 //TextArea creates a textarea for a form with passed options
 func (f Form) TextArea(opts tags.Options) *tags.Tag {
-	// log.Println("[Warning] TextArea is deprecated and may be removed in the future, use TextAreaTag instead")
 	return f.TextAreaTag(opts)
 }