Skip to content

Commit

Permalink
feat(module:input-number): use boundary value instead of previous val…
Browse files Browse the repository at this point in the history
…ue (#731)
  • Loading branch information
vthinkxie authored Dec 11, 2017
1 parent 6b095a8 commit 48e40f4
Showing 1 changed file with 18 additions and 22 deletions.
40 changes: 18 additions & 22 deletions src/components/input-number/nz-input-number.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import { toBoolean } from '../util/convert';
encapsulation: ViewEncapsulation.None,
template : `
<div class="ant-input-number-handler-wrap"
(mouseover)="_mouseInside = true"
(mouseout)="_mouseInside = false">
(mouseover)="_mouseInside = true"
(mouseout)="_mouseInside = false">
<a class="ant-input-number-handler ant-input-number-handler-up"
[ngClass]="{'ant-input-number-handler-up-disabled':_disabledUp}"
(click)="_numberUp($event)">
[ngClass]="{'ant-input-number-handler-up-disabled':_disabledUp}"
(click)="_numberUp($event)">
<span
class="ant-input-number-handler-up-inner"
(click)="$event.preventDefault();"></span>
Expand All @@ -42,18 +42,17 @@ import { toBoolean } from '../util/convert';
<div
class="ant-input-number-input-wrap">
<input class="ant-input-number-input"
#inputNumber
[placeholder]="nzPlaceHolder"
[disabled]="nzDisabled"
[(ngModel)]="_displayValue"
(blur)="_emitBlur($event)"
(focus)="_emitFocus($event)"
(keydown)="_emitKeydown($event)"
(ngModelChange)="_userInputChange()"
[attr.min]="nzMin"
[attr.max]="nzMax"
[attr.step]="_step"
autocomplete="off">
#inputNumber
[placeholder]="nzPlaceHolder"
[disabled]="nzDisabled"
[(ngModel)]="_displayValue"
(blur)="_emitBlur($event)"
(focus)="_emitFocus($event)"
(keydown)="_emitKeyDown($event)"
[attr.min]="nzMin"
[attr.max]="nzMax"
[attr.step]="_step"
autocomplete="off">
</div>`,
providers : [
{
Expand Down Expand Up @@ -181,22 +180,19 @@ export class NzInputNumberComponent implements ControlValueAccessor {
}
}

_emitKeydown($event: KeyboardEvent): void {
_emitKeyDown($event: KeyboardEvent): void {
if ($event.keyCode === TAB && this._focused) {
this._checkValue();
this._focused = false;
this.nzBlur.emit($event);
}
}

_userInputChange(): void {
_checkValue(): void {
const numberValue = +this._displayValue;
if (this._isNumber(numberValue) && (numberValue <= this.nzMax) && (numberValue >= this.nzMin)) {
if (this._isNumber(numberValue)) {
this.nzValue = numberValue;
}
}

_checkValue(): void {
this._displayValue = this.nzValue;
}

Expand Down

0 comments on commit 48e40f4

Please sign in to comment.