From 81b6aa196e3391d34c4e0c114447e21f5a5ee069 Mon Sep 17 00:00:00 2001 From: Uri Shaked Date: Sat, 19 Sep 2015 03:17:41 +0300 Subject: [PATCH] feat(amTimeAgo): align with angular-2.0.0-alpha.37 --- .editorconfig | 18 ++++++++++++++++++ .gitignore | 1 + CHANGELOG.md | 3 +++ TimeAgoPipe.spec.ts | 2 +- TimeAgoPipe.ts | 28 ++++++++++++++-------------- package.json | 10 +++++----- 6 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..4cd32a9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + +[*] + +# Change these settings to your own preference +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index 3c3629e..7a1537b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +.idea node_modules diff --git a/CHANGELOG.md b/CHANGELOG.md index 21bec16..8ef6771 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.0.2 - 2015-09-18 +- Align with angular-2.0.0-alpha.37 + ## 0.0.1 - 2015-08-25 - Initial release diff --git a/TimeAgoPipe.spec.ts b/TimeAgoPipe.spec.ts index c82172a..6fe4e04 100644 --- a/TimeAgoPipe.spec.ts +++ b/TimeAgoPipe.spec.ts @@ -24,7 +24,7 @@ describe('TimeAgo', () => { it('should support moment instances', () => { expect(pipe.supports(moment())).toBe(true); }); - + it('should not support string', () => { expect(pipe.supports('foobar')).toBe(false); }); diff --git a/TimeAgoPipe.ts b/TimeAgoPipe.ts index eeee120..a37d24f 100644 --- a/TimeAgoPipe.ts +++ b/TimeAgoPipe.ts @@ -1,6 +1,6 @@ /* angular2-moment / v0.0.1 / (c) 2015 Uri Shaked / MIT Licence */ -/// +/// import {Pipe, ChangeDetectorRef} from 'angular2/angular2'; import * as moment_ from 'moment'; @@ -10,35 +10,35 @@ const moment = moment_['default'] || moment_; @Pipe({name: 'amTimeAgo'}) export class TimeAgoPipe implements Pipe { - private _currentTimer: number; - - constructor(private _cdRef: ChangeDetectorRef) { + private _currentTimer:number; + + constructor(private _cdRef:ChangeDetectorRef) { } - - supports(value:any): boolean { + + supports(value:any):boolean { return value instanceof Date || moment.isMoment(value); } - - transform(value: Date | moment.Moment, args?: List): any { + + transform(value:Date | moment.Moment, args?:List):any { let momentInstance = moment(value); this._removeTimer(); let timeToUpdate = this._getSecondsUntilUpdate(momentInstance) * 1000; - this._currentTimer = setTimeout(() => this._cdRef.requestCheck(), timeToUpdate); + this._currentTimer = setTimeout(() => this._cdRef.markForCheck(), timeToUpdate); return moment(value).from(moment()); } - - onDestroy(): void { + + onDestroy():void { this._removeTimer(); } - + _removeTimer() { if (this._currentTimer) { clearTimeout(this._currentTimer); this._currentTimer = null; } } - - _getSecondsUntilUpdate(momentInstance: moment.Moment) { + + _getSecondsUntilUpdate(momentInstance:moment.Moment) { var howOld = Math.abs(moment().diff(momentInstance, 'minute')); if (howOld < 1) { return 1; diff --git a/package.json b/package.json index 72b213e..4957d60 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,11 @@ }, "homepage": "https://github.com/urish/angular2-moment#readme", "dependencies": { - "angular2": "^2.0.0-alpha.35", + "angular2": "^2.0.0-alpha.37", "moment": "^2.10.6" }, "devDependencies": { - "es6-shim": "^0.33.1", + "es6-shim": "0.33.3", "es6-symbol": "^2.0.1", "jasmine-core": "^2.3.4", "karma": "^0.13.9", @@ -35,9 +35,9 @@ "karma-sourcemap-loader": "^0.3.5", "karma-webpack": "^1.7.0", "phantomjs": "^1.9.18", - "reflect-metadata": "^0.1.0", - "typescript": "^1.5.3", - "typescript-simple-loader": "^0.3.4", + "reflect-metadata": "0.1.1", + "typescript": "1.6.2", + "typescript-simple-loader": "0.3.7", "webpack": "^1.11.0" } }