ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5506 from tsiegleauq/update-to-tinymce-5.4.1 

Update TinyMCE and TinyMCE angular
This commit is contained in:
Emanuel Schütze 2020-08-13 20:03:02 +02:00 committed by GitHub
parent 2b3766b758 b59c69e086
commit a46d8ec7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/angular.json
View File

@ -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"],

4
client/package.json
View File

@ -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"

6
client/src/app/shared/shared.module.ts
View File

@ -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,