fix(datepicker): fix 'util' import and use 'isInteger' (#2738)

ng-bootstrap · Sep 21, 2018 · e3fa911 · e3fa911
1 parent 69d6321
commit e3fa911
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/datepicker/adapters/ngb-date-adapter.ts b/src/datepicker/adapters/ngb-date-adapter.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {NgbDateStruct} from '../ngb-date-struct';
-import {isNumber} from 'util';
+import {isInteger} from '../../util/util';
 
 export function NGB_DATEPICKER_DATE_ADAPTER_FACTORY() {
   return new NgbDateStructAdapter();
@@ -32,7 +32,7 @@ export class NgbDateStructAdapter extends NgbDateAdapter<NgbDateStruct> {
    * Converts a NgbDateStruct value into NgbDateStruct value
    */
   fromModel(date: NgbDateStruct): NgbDateStruct {
-    return (date && isNumber(date.year) && isNumber(date.month) && isNumber(date.day)) ?
+    return (date && isInteger(date.year) && isInteger(date.month) && isInteger(date.day)) ?
         {year: date.year, month: date.month, day: date.day} :
         null;
   }
@@ -41,7 +41,7 @@ export class NgbDateStructAdapter extends NgbDateAdapter<NgbDateStruct> {
    * Converts a NgbDateStruct value into NgbDateStruct value
    */
   toModel(date: NgbDateStruct): NgbDateStruct {
-    return (date && isNumber(date.year) && isNumber(date.month) && isNumber(date.day)) ?
+    return (date && isInteger(date.year) && isInteger(date.month) && isInteger(date.day)) ?
         {year: date.year, month: date.month, day: date.day} :
         null;
   }

diff --git a/src/datepicker/adapters/ngb-date-native-adapter.ts b/src/datepicker/adapters/ngb-date-native-adapter.ts
@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {NgbDateAdapter} from './ngb-date-adapter';
 import {NgbDateStruct} from '../ngb-date-struct';
-import {isNumber} from 'util';
+import {isInteger} from '../../util/util';
 
 @Injectable()
 export class NgbDateNativeAdapter extends NgbDateAdapter<Date> {
@@ -10,7 +10,8 @@ export class NgbDateNativeAdapter extends NgbDateAdapter<Date> {
   }
 
   toModel(date: NgbDateStruct): Date {
-    return date && isNumber(date.year) && isNumber(date.month) && isNumber(date.day) ? this._toNativeDate(date) : null;
+    return date && isInteger(date.year) && isInteger(date.month) && isInteger(date.day) ? this._toNativeDate(date) :
+                                                                                          null;
   }
 
   protected _fromNativeDate(date: Date): NgbDateStruct {

diff --git a/tslint.json b/tslint.json
@@ -17,7 +17,8 @@
     "import-blacklist": [
       true,
       "rxjs/Rx",
-      "rxjs/index"
+      "rxjs/index",
+      "util"
     ],
     "indent": [
       true,