Skip to content

Commit a992a7a

Browse files
committed
Merge branch 'develop'
2 parents 3e03c37 + 61a59a1 commit a992a7a

15 files changed

+4113
-6166
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to **angular-material-shared** are documented here.
44

5+
## v2.6.0:
6+
7+
- tinymce was updated to v7
8+
59
## v2.5.0:
610

711
- Update Angular to v17

README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,7 @@ FooterOptions {
8686
A rich-text WYSIWYG editor is available as `dangl-tiny-mce` component. This one requires the package `tinymce` to be referenced and available as global variable. To make it available, add this to your `scripts` section in `.angular-cli.json`:
8787

8888
"scripts": [
89-
"../node_modules/tinymce/tinymce.js",
90-
"../node_modules/tinymce/themes/silver/theme.js",
91-
"../node_modules/tinymce/plugins/link/plugin.js",
92-
"../node_modules/tinymce/plugins/paste/plugin.js",
93-
"../node_modules/tinymce/plugins/table/plugin.js",
94-
"../node_modules/tinymce/plugins/image/plugin.js",
95-
"../node_modules/tinymce/plugins/code/plugin.js"
89+
"../node_modules/tinymce/tinymce.js"
9690
]
9791

9892
Additionally, TinyMCE must load skins and other assets at runtime and requires the path to it. You can inject it in your `AppModule`:

src/angular-material-shared-demo/angular.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,7 @@
2626
"src/styles.scss"
2727
],
2828
"scripts": [
29-
"node_modules/tinymce/tinymce.min.js",
30-
"node_modules/tinymce/themes/silver/theme.min.js",
31-
"node_modules/tinymce/plugins/link/plugin.min.js",
32-
"node_modules/tinymce/plugins/paste/plugin.min.js",
33-
"node_modules/tinymce/plugins/table/plugin.min.js",
34-
"node_modules/tinymce/plugins/image/plugin.min.js",
35-
"node_modules/tinymce/plugins/code/plugin.min.js"
29+
"node_modules/tinymce/tinymce.min.js"
3630
],
3731
"vendorChunk": true,
3832
"extractLicenses": false,

0 commit comments

Comments
 (0)