Skip to content

Commit

Permalink
Merge pull request kolkov#474 from kolkov/v13-downgrade
Browse files Browse the repository at this point in the history
V13 downgrade + font awesome local serving
  • Loading branch information
pietzschke authored Jul 12, 2022
2 parents f20913f + db60863 commit 1340ba7
Show file tree
Hide file tree
Showing 16 changed files with 15,666 additions and 18,094 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ before_install:
install:
- npm install
before_script:
- npm install -g @angular/cli
- npm install -g @angular/cli@13
- npm install -g codecov
script:
- npm run lint:lib
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,16 @@ editorConfig: AngularEditorConfig = {
```
For `ngModel` to work, you must import `FormsModule` from `@angular/forms`, or for `formControlName`, you must import `ReactiveFormsModule` from `@angular/forms`

To serve the fontawesome files, ensure that your angular.json contains the following asset configuration:

```
{
"glob": "**/*",
"input": "./node_modules/@kolkov/angular-editor/assets/",
"output": "./assets/fonts/"
}
```

### Custom buttons

You can define your custom buttons with custom actions using executeCommandFn. It accepts commands from [execCommand](https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand).
Expand Down
7 changes: 6 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,12 @@
"tsConfig": "projects/angular-editor-app/tsconfig.app.json",
"assets": [
"projects/angular-editor-app/src/favicon.ico",
"projects/angular-editor-app/src/assets"
"projects/angular-editor-app/src/assets",
{
"glob": "**/*",
"input": "node_modules/font-awesome/fonts",
"output": "assets/fonts/"
}
],
"styles": [
"projects/angular-editor-app/src/styles.scss"
Expand Down
Loading

0 comments on commit 1340ba7

Please sign in to comment.