diff --git a/client/angular.json b/client/angular.json index e3e99f169..88799e93a 100644 --- a/client/angular.json +++ b/client/angular.json @@ -28,18 +28,8 @@ "src/manifest.json", { "glob": "**/*", - "input": "node_modules/tinymce/skins", - "output": "/tinymce/skins/" - }, - { - "glob": "**/*", - "input": "node_modules/tinymce/themes", - "output": "/tinymce/themes/" - }, - { - "glob": "**/*", - "input": "node_modules/tinymce/plugins", - "output": "/tinymce/plugins/" + "input": "node_modules/tinymce", + "output": "/tinymce/" } ], "styles": ["src/styles.scss"], diff --git a/client/package.json b/client/package.json index 5b2440fa1..90fe49380 100644 --- a/client/package.json +++ b/client/package.json @@ -51,7 +51,7 @@ "@pebula/ngrid": "2.0.0-rc.1", "@pebula/ngrid-material": "2.0.0-rc.1", "@pebula/utils": "1.0.2", - "@tinymce/tinymce-angular": "^3.6.0", + "@tinymce/tinymce-angular": "^4.1.0", "@videojs/http-streaming": "^1.13.3", "acorn": "^7.1.0", "chart.js": "^2.9.2", @@ -73,7 +73,7 @@ "pdfmake": "^0.1.63", "po2json": "^1.0.0-beta-2", "rxjs": "^6.5.4", - "tinymce": "5.2.2", + "tinymce": "5.4.1", "tslib": "^1.10.0", "video.js": "^7.7.6", "zone.js": "~0.10.2" diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index a96e2296b..e87bf7192 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts @@ -50,7 +50,7 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { NgxFileDropModule } from 'ngx-file-drop'; // TinyMCE -import { EditorModule } from '@tinymce/tinymce-angular'; +import { EditorModule, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular'; // directives import { PermsDirective } from './directives/perms.directive'; @@ -369,6 +369,10 @@ import { LiveStreamComponent } from './components/live-stream/live-stream.compon useClass: OpenSlidesDateAdapter, deps: [TranslateService, MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS] }, // see remarks in OpenSlidesDateAdapter + { + provide: TINYMCE_SCRIPT_SRC, + useValue: 'tinymce/tinymce.min.js' + }, SearchValueSelectorComponent, SortingListComponent, SortingTreeComponent,