Skip to content

Commit

Permalink
feat(md-input): add md-step option for number input types( allows dec…
Browse files Browse the repository at this point in the history
…imals and preset increments)

chore(sample): add md-input md-step example
chore(md-pagination): fix lint error
  • Loading branch information
acamilleri committed Aug 12, 2016
1 parent 57e2e77 commit 19a6892
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 10 deletions.
11 changes: 11 additions & 0 deletions sample/src/samples/input/input-types.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,16 @@
<md-input md-type="email" md-label="email text field" md-validate="true" md-validate-error="invalid email" md-value.bind="email"></md-input><br />
</div>
</md-card>
<md-card md-title="Float Number input">
<div>
<md-input md-type="number" md-step="any" md-label="float number text field" md-validate="true" md-validate-error="invalid number" md-value.bind="floatingNumber"></md-input><br />
</div>
</md-card>
<md-card md-title="Number input">
<div>
<md-input md-type="number" md-step="2" md-label="number text field" md-validate="true" md-validate-error="invalid number" md-value.bind="number"></md-input><br />
</div>
</md-card>

</div>
</template>
2 changes: 2 additions & 0 deletions sample/src/samples/input/input-types.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
export class InputTypes {
password = '';
email = '';
number = 0;
floatingNumber = 0.00;
}
18 changes: 9 additions & 9 deletions src/input/input.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template>
<template>
<require from="./input.css"></require>
<div class="input-field">
<!-- <content select="[md-prefix]"></content> -->
<slot></slot>
<input if.bind="mdTextArea === false" id="${controlId}" type.bind="mdType" ref="input" value.bind="mdValue" disabled.bind="mdDisabled" />
<textarea if.bind="mdTextArea === true" id="${controlId}" ref="input" value.bind="mdValue" class="materialize-textarea" disabled.bind="mdDisabled"></textarea>
<label for="${controlId}" ref="label">${mdLabel}</label>
</div>
</template>
<div class="input-field">
<!-- <content select="[md-prefix]"></content> -->
<slot></slot>
<input if.bind="mdTextArea === false" id="${controlId}" type.bind="mdType" step.bind="mdStep" ref="input" value.bind="mdValue" disabled.bind="mdDisabled" />
<textarea if.bind="mdTextArea === true" id="${controlId}" ref="input" value.bind="mdValue" class="materialize-textarea" disabled.bind="mdDisabled"></textarea>
<label for="${controlId}" ref="label">${mdLabel}</label>
</div>
</template>
3 changes: 3 additions & 0 deletions src/input/input.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ export class MdInput {
@bindable({
defaultBindingMode: bindingMode.oneTime
}) mdType = 'text';
@bindable({
defaultBindingMode: bindingMode.oneTime
}) mdStep = 'any';
@bindable({
defaultBindingMode: bindingMode.oneTime
}) mdValidate = false;
Expand Down
2 changes: 1 addition & 1 deletion src/pagination/pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export class MdPagination {

generatePageLinks() {
let numberOfLinks = parseInt(this.mdVisiblePageLinks, 10);
let midPoint = parseInt((numberOfLinks / 2));
let midPoint = parseInt((numberOfLinks / 2), 10);
let start = Math.max(this.mdActivePage - midPoint, 0);
let end = Math.min(start + numberOfLinks, this.mdPages);

Expand Down

0 comments on commit 19a6892

Please sign in to comment.