Skip to content

Updated material icons - fix for issue #101 #105

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 2 commits into
base: master
Choose a base branch
from
Open

Updated material icons - fix for issue #101 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0362d8
updated material icons
currychern Sep 20, 2016
853809e
added multiple selects fix from samybob1
currychern Sep 20, 2016
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: 2 additions & 2 deletions components/afArrayField/afArrayField.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
data-autoform-field="{{atts.name}}"
data-autoform-minCount="{{atts.minCount}}"
data-autoform-maxCount="{{atts.maxCount}}">
Add <i class="mdi-content-add"></i>
Add <i class="material-icons">add</i>
</button>
{{/if}}
</div>
Expand All @@ -26,7 +26,7 @@
{{#if afArrayFieldHasMoreThanMinimum name=../atts.name minCount=../atts.minCount maxCount=../atts.maxCount}}
<div class="collection-item">
<button type="button" class="btn autoform-remove-item">
Remove <span class="mdi-content-clear"></span>
Remove <i class="material-icons">clear</i>
</button>
</div>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion components/afFormGroup/afFormGroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{/if}}
{{#if afFieldIsInvalid name=this.name}}
<div class="red-text">
<i class="mdi-alert-warning"></i> {{{afFieldMessage name=this.name}}}
<i class="material-icons">warning</i> {{{afFieldMessage name=this.name}}}
</div>
{{/if}}
</div>
Expand Down
1 change: 1 addition & 0 deletions components/afFormGroup/afFormGroup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Template.afFormGroup_materialize.rendered = function() {
var placeholder = _this.data.afFieldInputAtts.placeholder;
var skipActiveLabelTypes = [
'select',
'select-multiple',
'checkbox',
'checkbox-group',
'boolean-checkbox',
Expand Down
8 changes: 2 additions & 6 deletions inputTypes/select-multiple/select-multiple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
Template.afSelectMultiple_materialize.helpers({
atts: Utility.attsToggleInvalidClass,
optionAtts: Utility.optionAtts
});

Template.afSelectMultiple_materialize.helpers({
atts: function() {
var atts = Utility.attsToggleInvalidClass.call(this);
return AutoForm.Utility.addClass(atts, 'browser-default');
}
});
Template.afSelectMultiple_materialize.onRendered(Utility.initializeSelect);
14 changes: 8 additions & 6 deletions utilities/option-atts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
Utility.optionAtts = function() {
var atts, item;
item = this;
atts = {
value: item.value
};
if (item.selected) {
var atts = _.pick(this, 'value');

if(this.selected) {
atts.selected = '';
}

if (!_.isEmpty(this.htmlAtts)) {
_.extend(atts, this.htmlAtts);
}

return atts;
};