[Admin | Trunk]: Change cdeditor library

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@59270 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-08-14 09:49:53 +00:00
parent 49a49ba358
commit c41fd071fe
7 changed files with 14 additions and 24 deletions

View File

@ -30,17 +30,17 @@
"@types/node": "^6.0.101", "@types/node": "^6.0.101",
"angular-datatables": "^4.4.1", "angular-datatables": "^4.4.1",
"citation-js": "^0.3.4", "citation-js": "^0.3.4",
"ckeditor4-angular": "^1.2.2",
"clipboard": "^1.5.16", "clipboard": "^1.5.16",
"core-js": "2.6.8", "core-js": "2.6.8",
"datatables.net": "^1.10.19", "datatables.net": "^1.10.19",
"datatables.net-dt": "^1.10.19", "datatables.net-dt": "^1.10.19",
"interactiveminingv3": "file:interactiveminingv3.tgz", "interactiveminingv3": "file:interactiveminingv3.tgz",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"ng2-ckeditor": "1.1.9", "ng-recaptcha": "^3.0.5",
"ngx-bootstrap": "^1.6.6", "ngx-bootstrap": "^1.6.6",
"ngx-color-picker": "^8.1.0", "ngx-color-picker": "^8.1.0",
"ngx-json-ld": "0.1.6", "ngx-json-ld": "0.1.6",
"ng-recaptcha": "^3.0.5",
"ts-md5": "^1.2.0", "ts-md5": "^1.2.0",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"zone.js": "0.8.29" "zone.js": "0.8.29"

View File

@ -5,7 +5,7 @@ import {FABModule} from '../../utils/fabModule.module';
import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module'; import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module';
import {DivContentFormComponent} from './div-help-content-form.component'; import {DivContentFormComponent} from './div-help-content-form.component';
import {CKEditorModule} from 'ng2-ckeditor'; import {CKEditorModule} from 'ckeditor4-angular';
@NgModule({ @NgModule({
imports: [ imports: [

View File

@ -1,16 +1,10 @@
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommunity.guard'; import {IsCommunity} from '../../openaireLibrary/connect/communityGuard/isCommunity.guard';
import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard'; import {ConnectAdminLoginGuard} from '../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {FABModule} from '../../utils/fabModule.module';
import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module';
import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module'; import {EditDivHelpContentRoutingModule} from './edit-div-help-content-routing.module';
import {CKEditorModule} from 'ng2-ckeditor';
import {EditDivHelpContentComponent} from './edit-div-help-content.component'; import {EditDivHelpContentComponent} from './edit-div-help-content.component';
import {DivContentFormComponent} from './div-help-content-form.component';
import {DivHelpContentFormModule} from './div-help-content-form.module'; import {DivHelpContentFormModule} from './div-help-content-form.module';
@NgModule({ @NgModule({

View File

@ -39,7 +39,7 @@
}', }',
disallowedContent:'script; *[on*]'}" --> disallowedContent:'script; *[on*]'}" -->
<ckeditor <ckeditor
[readonly]="false" [readOnly]="false"
debounce="500" debounce="500"
formControlName="content" formControlName="content"
[config]="{ extraAllowedContent: '* [uk-*](*) ; span', disallowedContent: 'script; *[on*]', removeButtons: 'Save,NewPage,DocProps,Preview,Print', [config]="{ extraAllowedContent: '* [uk-*](*) ; span', disallowedContent: 'script; *[on*]', removeButtons: 'Save,NewPage,DocProps,Preview,Print',

View File

@ -4,7 +4,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {FABModule} from '../../utils/fabModule.module'; import {FABModule} from '../../utils/fabModule.module';
import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module'; import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module';
import {CKEditorModule} from 'ng2-ckeditor'; import {CKEditorModule} from 'ckeditor4-angular';
import {PageContentFormComponent} from './page-help-content-form.component'; import {PageContentFormComponent} from './page-help-content-form.component';
@NgModule({ @NgModule({

View File

@ -1,20 +1,19 @@
import { NgModule } from '@angular/core'; import {NgModule} from '@angular/core';
import { BrowserModule } from '@angular/platform-browser'; import {HttpClientModule} from '@angular/common/http';
import { HttpClientModule } from '@angular/common/http'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import {RouterModule} from '@angular/router';
import { RouterModule } from '@angular/router';
import { CKEditorModule } from 'ng2-ckeditor';
import {ErrorMessagesModule} from '../../openaireLibrary/utils/errorMessages.module'; import {ErrorMessagesModule} from '../../openaireLibrary/utils/errorMessages.module';
import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module';
import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module'; import {SafeHtmlPipeModule} from '../../openaireLibrary/utils/pipes/safeHTMLPipe.module';
import { HtmlPageContentFormComponent } from './html-page-content-form.component'; import {HtmlPageContentFormComponent} from './html-page-content-form.component';
import { EditHtmlPageContentComponent } from './edit-htmlpage-content.component'; import {EditHtmlPageContentComponent} from './edit-htmlpage-content.component';
import { HtmlPageContentService } from './html-page-content.service'; import {HtmlPageContentService} from './html-page-content.service';
import {EditHtmlPageContentRoutingModule} from './edit-html-page-content-routing.module'; import {EditHtmlPageContentRoutingModule} from './edit-html-page-content-routing.module';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {CKEditorModule} from 'ckeditor4-angular';
@NgModule({ @NgModule({
imports: [ imports: [

View File

@ -30,9 +30,6 @@
<script src="assets/common-assets/common/uikit.min.js?v=2"></script> <script src="assets/common-assets/common/uikit.min.js?v=2"></script>
<script src="assets/common-assets/common/uikit-icons.min.js?v=2"></script> <script src="assets/common-assets/common/uikit-icons.min.js?v=2"></script>
<script src="https://cdn.ckeditor.com/4.5.11/full-all/ckeditor.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
</head> </head>
<body> <body>