Skip to content

Commit

Permalink
Merge branch 'master' into ck/11210
Browse files Browse the repository at this point in the history
  • Loading branch information
@niegowski
niegowski committed Mar 22, 2024
2 parents a9a456c + e9f0c13 commit e19afc0
Show file tree
Hide file tree
Showing 1,070 changed files with 8,528 additions and 4,083 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -10,6 +10,7 @@
# Files associated with CKEditor 5 repository.
**/node_modules
build/
dist/
!packages/ckeditor5-build-*/build
docs/api/output.json
yarn.lock
Expand Down
1,305 changes: 504 additions & 801 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -67,7 +67,7 @@ In your HTML page, add an element that CKEditor should replace:
Load the classic editor build (you can choose between the [CDN](https://cdn.ckeditor.com/#ckeditor5), [npm](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/predefined-builds.html#npm), and [zip downloads](https://ckeditor.com/docs/ckeditor5/latest/installation/getting-started/predefined-builds.html#zip-download)):

```html
<script src="https://cdn.ckeditor.com/ckeditor5/41.1.0/classic/ckeditor.js"></script>
<script src="https://cdn.ckeditor.com/ckeditor5/41.2.1/classic/ckeditor.js"></script>
```

Call the [`ClassicEditor.create()`](https://ckeditor.com/docs/ckeditor5/latest/api/module_editor-classic_classiceditor-ClassicEditor.html#static-function-create) method:
Expand Down
2 changes: 1 addition & 1 deletion docs/_snippets/features/image-upload.js
View file
Expand Up @@ -60,7 +60,7 @@ ClassicEditor
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 2 additions & 2 deletions docs/_snippets/features/keyboard-support.js
View file
Expand Up @@ -5,7 +5,7 @@

/* globals window, document, open, console, LICENSE_KEY */

// Keep the guide listing updated with each change
// Keep the guide listing updated with each change.

import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
import { Alignment } from '@ckeditor/ckeditor5-alignment';
Expand Down Expand Up @@ -68,7 +68,7 @@ import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.j
// Allow using internal license keys in this sample. See CF#2555.
open.closed = 1;

// templates icons
// Templates icons.
import articleImageRightIcon from '../../assets/img/article-image-right.svg';
import financialReportIcon from '../../assets/img/financial-report.svg';
import formalLetterIcon from '../../assets/img/formal-letter.svg';
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/mathtype.js
View file
Expand Up @@ -8,6 +8,7 @@
import { ClassicEditor } from '@ckeditor/ckeditor5-editor-classic';
import { CloudServices } from '@ckeditor/ckeditor5-cloud-services';
import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';
import ArticlePluginSet from '@ckeditor/ckeditor5-core/tests/_utils/articlepluginset.js';
import { ImageInsert, ImageUpload, PictureEditing } from '@ckeditor/ckeditor5-image';
import MathType from '@wiris/mathtype-ckeditor5';
Expand Down Expand Up @@ -39,8 +40,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
},
image: {
toolbar: [
Expand Down
2 changes: 2 additions & 0 deletions docs/_snippets/features/placeholder-custom.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals console, window, document, ClassicEditor */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-placeholder-custom' ), {
Expand All @@ -23,6 +24,7 @@ ClassicEditor
]
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true
},
ui: {
Expand Down
2 changes: 2 additions & 0 deletions docs/_snippets/features/placeholder.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals console, window, document, ClassicEditor */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-placeholder' ), {
Expand All @@ -23,6 +24,7 @@ ClassicEditor
]
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true
},
ui: {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/read-only-hide-toolbar.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-read-only-toolbar' ), {
Expand All @@ -31,8 +32,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/read-only.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-read-only' ), {
Expand All @@ -31,8 +32,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
},
exportPdf: {
stylesheets: [
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-basic.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-basic' ), {
Expand All @@ -29,8 +30,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-breakpoint.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-breakpoint' ), {
Expand All @@ -28,8 +29,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
},
image: {
toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:wrapText',
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-grouping.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-grouping' ), {
Expand All @@ -25,8 +26,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
},
image: {
toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:wrapText',
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-nested-icon.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-nested-icon' ), {
Expand Down Expand Up @@ -52,8 +53,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-nested-label.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-nested-label' ), {
Expand Down Expand Up @@ -41,8 +42,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-nested-simple.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-nested-simple' ), {
Expand Down Expand Up @@ -44,8 +45,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-nested-tooltip.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-nested-tooltip' ), {
Expand Down Expand Up @@ -35,8 +36,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-separator.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-separator' ), {
Expand All @@ -29,8 +30,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/toolbar-wrapping.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#toolbar-wrapping' ), {
Expand All @@ -27,8 +28,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
},
image: {
toolbar: [ 'imageStyle:inline', 'imageStyle:block', 'imageStyle:wrapText',
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/ui-language-content.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-ui-language-content' ), {
Expand Down Expand Up @@ -34,8 +35,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/ui-language-rtl.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-ui-language-rtl' ), {
Expand All @@ -32,8 +33,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/ui-language.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals ClassicEditor, console, window, document */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-ui-language' ), {
Expand All @@ -32,8 +33,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
}
} )
.then( editor => {
Expand Down
2 changes: 2 additions & 0 deletions docs/_snippets/features/update-placeholder.js
View file
Expand Up @@ -6,6 +6,7 @@
/* globals console, window, document, ClassicEditor */

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-update-placeholder' ), {
Expand All @@ -17,6 +18,7 @@ ClassicEditor
'|', 'bulletedList', 'numberedList', 'outdent', 'indent'
],
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true
},
ui: {
Expand Down
4 changes: 3 additions & 1 deletion docs/_snippets/features/wproofreader.js
View file
Expand Up @@ -13,6 +13,7 @@ import { PictureEditing, ImageInsert, ImageUpload } from '@ckeditor/ckeditor5-im
import WProofreader from '@webspellchecker/wproofreader-ckeditor5/src/wproofreader.js';

import { CS_CONFIG } from '@ckeditor/ckeditor5-cloud-services/tests/_utils/cloud-services-config.js';
import { TOKEN_URL } from '@ckeditor/ckeditor5-ckbox/tests/_utils/ckbox-config.js';

ClassicEditor
.create( document.querySelector( '#snippet-wproofreader' ), {
Expand All @@ -39,8 +40,9 @@ ClassicEditor
}
},
ckbox: {
tokenUrl: TOKEN_URL,
forceDemoLabel: true,
allowExternalImagesEditing: [ /^data:/, 'origin' ]
allowExternalImagesEditing: [ /^data:/, 'origin', /ckbox/ ]
},
image: {
toolbar: [
Expand Down

0 comments on commit e19afc0

Please sign in to comment.