Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion addon/components/fm-checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ export default Ember.Component.extend({
userInteraction() {
this.set('shouldShowErrors', true);
}
}
},

inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass')
});
1 change: 1 addition & 0 deletions addon/components/fm-field.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export default Ember.Component.extend({
labelClass: Ember.computed.reads('fmConfig.labelClass'),
textareaClass: Ember.computed.reads('fmConfig.textareaClass'),
wrapperClass: Ember.computed.reads('fmConfig.wrapperClass'),
inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass'),

init: function() {
if(!this.get('optionValuePath')) {
Expand Down
4 changes: 3 additions & 1 deletion addon/components/fm-radio-group.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@ export default Ember.Component.extend({
userInteraction() {
this.set('shouldShowErrors', true);
}
}
},

inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass')
});
1 change: 1 addition & 0 deletions addon/components/fm-submit.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default Ember.Component.extend({
init: function() {
this._super(this);
},
inputWrapperClass: Ember.computed.reads('fmConfig.inputWrapperClass'),
submitButtonClass: Ember.computed.reads('fmConfig.submitButtonClass'),
wrapperClass: Ember.computed.reads('fmConfig.wrapperClass'),
tagName: 'div'
Expand Down
1 change: 1 addition & 0 deletions addon/services/fm-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default Ember.Service.extend({
wrapperClass: 'form-group',
labelClass: 'control-label',
inputClass: 'form-control',
inputWrapperClass: '',
textareaClass: 'form-control',
selectClass: 'form-control',
formClass: 'form-vertical',
Expand Down
30 changes: 16 additions & 14 deletions addon/templates/components/ember-form-master-2000/fm-checkbox.hbs
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
<div class='checkbox'>
<div class={{inputWrapperClass}}>
<div class='checkbox'>

<label>
{{input
type='checkbox'
checked=checked
disabled=disabled
name=name
tabindex=tabindex}}
{{label}}
</label>
<label>
{{input
type='checkbox'
checked=checked
disabled=disabled
name=name
tabindex=tabindex}}
{{label}}
</label>

{{#if showErrors}}
{{fm-errortext errors=errors}}
{{/if}}
{{#if showErrors}}
{{fm-errortext errors=errors}}
{{/if}}

</div>
</div>
</div>
82 changes: 42 additions & 40 deletions addon/templates/components/ember-form-master-2000/fm-field.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,49 @@
<label for="{{forAttribute}}" class="{{labelClass}}">{{{label}}}</label>
{{/if}}

{{#if isBasicInput}}
{{fm-input
type=type
value=value
classNameBindings='errorClass inputClass'
maxlength=maxlength
placeholder=placeholder
onUserInteraction='userInteraction'
}}
{{/if}}
<div class={{inputWrapperClass}}>
{{#if isBasicInput}}
{{fm-input
type=type
value=value
classNameBindings='errorClass inputClass'
maxlength=maxlength
placeholder=placeholder
onUserInteraction='userInteraction'
}}
{{/if}}

{{#if isSelect}}
{{fm-select
content=content
optionValuePath=optionValuePath
optionLabelPath=optionLabelPath
prompt=prompt
value=value
action=(action 'selectAction')
onUserInteraction='userInteraction'
}}
{{/if}}
{{#if isSelect}}
{{fm-select
content=content
optionValuePath=optionValuePath
optionLabelPath=optionLabelPath
prompt=prompt
value=value
action=(action 'selectAction')
onUserInteraction='userInteraction'
}}
{{/if}}

{{#if isTextarea}}
{{fm-textarea
value=value
classNameBindings='errorClass textareaClass'
placeholder=placeholder
rows=rows
cols=cols
maxlength=maxlength
spellcheck=spellcheck
disabled=disabled
onUserInteraction='userInteraction'
}}
{{/if}}
{{#if isTextarea}}
{{fm-textarea
value=value
classNameBindings='errorClass textareaClass'
placeholder=placeholder
rows=rows
cols=cols
maxlength=maxlength
spellcheck=spellcheck
disabled=disabled
onUserInteraction='userInteraction'
}}
{{/if}}

{{#if showErrors}}
{{fm-errortext errors=errors}}
{{/if}}
{{#if showErrors}}
{{fm-errortext errors=errors}}
{{/if}}

{{#if helptext}}
{{fm-helptext helptext=helptext}}
{{/if}}
{{#if helptext}}
{{fm-helptext helptext=helptext}}
{{/if}}
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
<label class='{{labelClass}}'>{{label}}</label>
{{/if}}

{{#each content as |option|}}
<div class={{inputWrapperClass}}>
{{#each content as |option|}}

{{fm-radio content=option onUserInteraction='userInteraction' optionLabelPath=optionLabelPath optionValuePath=optionValuePath}}
{{fm-radio content=option onUserInteraction='userInteraction' optionLabelPath=optionLabelPath optionValuePath=optionValuePath}}

{{/each}}
{{/each}}

{{#if showErrors}}
{{fm-errortext errors=errors}}
{{/if}}
{{#if showErrors}}
{{fm-errortext errors=errors}}
{{/if}}
</div>
22 changes: 12 additions & 10 deletions addon/templates/components/ember-form-master-2000/fm-submit.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<button
value={{value}}
disabled={{disabled}}
class='{{submitButtonClass}}'
type="submit">
{{#if value}}
{{value}}
{{/if}}
{{yield}}
</button>
<div class={{inputWrapperClass}}>
<button
value={{value}}
disabled={{disabled}}
class='{{submitButtonClass}}'
type="submit">
{{#if value}}
{{value}}
{{/if}}
{{yield}}
</button>
</div>
3 changes: 1 addition & 2 deletions tests/dummy/app/routes/application.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import Ember from 'ember';

export default Ember.Route.extend({

model: function() {
return Ember.RSVP.hash({
exampleModel: Ember.Object.create(),
Expand Down Expand Up @@ -77,4 +76,4 @@ export default Ember.Route.extend({

}

});
});