Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

Commit

Permalink
Merge 77ba324 into f4fd975
Browse files Browse the repository at this point in the history
  • Loading branch information
klemenoslaj committed Oct 22, 2018
2 parents f4fd975 + 77ba324 commit 5f84af8
Show file tree
Hide file tree
Showing 5 changed files with 885 additions and 883 deletions.
7 changes: 5 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,8 @@
}
}
},
"defaultProject": "playground"
}
"defaultProject": "playground",
"cli": {
"packageManager": "yarn"
}
}
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,52 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^6.1.0",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"@angular/animations": "^7.0.0",
"@angular/common": "^7.0.0",
"@angular/compiler": "^7.0.0",
"@angular/core": "^7.0.0",
"@angular/forms": "^7.0.0",
"@angular/http": "^7.0.0",
"@angular/platform-browser": "^7.0.0",
"@angular/platform-browser-dynamic": "^7.0.0",
"@angular/router": "^7.0.0",
"core-js": "^2.5.4",
"rxjs": "~6.3.3",
"travis-deploy-once": "^5.0.9",
"zone.js": "~0.8.26"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.8.0",
"@angular-devkit/build-ng-packagr": "~0.8.0",
"@angular/cli": "~6.2.3",
"@angular/compiler-cli": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@commitlint/cli": "^7.1.2",
"@angular-devkit/build-angular": "~0.10.0",
"@angular-devkit/build-ng-packagr": "^0.10.2",
"@angular/cli": "^7.0.2",
"@angular/compiler-cli": "^7.0.0",
"@angular/language-service": "^7.0.0",
"@commitlint/cli": "^7.2.1",
"@commitlint/config-conventional": "^7.1.2",
"@commitlint/travis-cli": "^7.1.2",
"@commitlint/travis-cli": "^7.2.1",
"@compodoc/compodoc": "^1.1.5",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"@types/node": "^10.12.0",
"codelyzer": "^4.5.0",
"coveralls": "^3.0.2",
"cz-conventional-changelog": "^2.1.0",
"husky": "^1.0.1",
"husky": "^1.1.2",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^4.1.0",
"ng-packagr": "^4.4.0",
"protractor": "~5.4.0",
"semantic-release": "^15.9.16",
"semantic-release": "^15.10.5",
"ts-node": "~7.0.0",
"tsickle": ">=0.29.0",
"tslib": "^1.9.0",
"tslint": "~5.11.0",
"typescript": "~2.9.2"
"typescript": "^3.1.3"
},
"release": {
"pkgRoot": "dist/core"
Expand Down
10 changes: 5 additions & 5 deletions projects/core/src/lib/action-abstract/action-abstract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ export const enum ActionState {
* this.fire$ = this.handleLivecycle(this.fire.asObservable(), false);
* this.custom$ = this.handleLivecycle(this.custom.asObservable());
* this.changes$ = this.handleLivecycle(Observable.merge(
* this.title$.map(title => (<ActionCustomOptions>{ title })),
* this.icon$.map(icon => (<ActionCustomOptions>{ icon })),
* this.visible$.map(visible => (<ActionCustomOptions>{ visible })),
* this.disabled$.map(disabled => (<ActionCustomOptions>{ disabled })),
* this.custom$.map(custom => (<ActionCustomOptions>{ custom }))
* this.title$.pipe(map(title => (<ActionCustomOptions>{ title }))),
* this.icon$.pipe(map(icon => (<ActionCustomOptions>{ icon }))),
* this.visible$.pipe(map(visible => (<ActionCustomOptions>{ visible }))),
* this.disabled$.pipe(map(disabled => (<ActionCustomOptions>{ disabled }))),
* this.custom$.pipe(map(custom => (<ActionCustomOptions>{ custom })))
* ));
* }
*
Expand Down
2 changes: 1 addition & 1 deletion projects/playground/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

/** Evergreen browsers require these. **/
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
import 'core-js/es7/reflect';
// import 'core-js/es7/reflect';


/**
Expand Down
Loading

0 comments on commit 5f84af8

Please sign in to comment.