diff --git a/.eslintrc.js b/.eslintrc.js index e82e66c..4a0a88f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* eslint-env node */ diff --git a/.travis.yml b/.travis.yml index 58976cd..02d2caf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,8 @@ sudo: required dist: trusty addons: + chrome: stable firefox: latest - apt: - sources: - - google-chrome - packages: - - google-chrome-stable language: node_js node_js: - '8' diff --git a/CHANGELOG.md b/CHANGELOG.md index d934813..1bad371 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ Changelog ========= +## [11.1.0](https://github.com/ckeditor/ckeditor5-basic-styles/compare/v11.0.0...v11.1.0) (2019-04-10) + +### Features + +* Marked basic style attributes as a formatting using the `AttributeProperties#isFormatting` property. Closes [ckeditor/ckeditor5#1664](https://github.com/ckeditor/ckeditor5/issues/1664). ([fcfba54](https://github.com/ckeditor/ckeditor5-basic-styles/commit/fcfba54)) + +### Other changes + +* Optimized icons. ([018dda9](https://github.com/ckeditor/ckeditor5-basic-styles/commit/018dda9)) +* Updated translations. ([4365251](https://github.com/ckeditor/ckeditor5-basic-styles/commit/4365251)) + + ## [11.0.0](https://github.com/ckeditor/ckeditor5-basic-styles/compare/v10.1.0...v11.0.0) (2019-02-28) ### Other changes diff --git a/docs/_snippets/features/basic-styles.js b/docs/_snippets/features/basic-styles.js index 079f619..a2620a3 100644 --- a/docs/_snippets/features/basic-styles.js +++ b/docs/_snippets/features/basic-styles.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals ClassicEditor, console, window, document */ diff --git a/docs/_snippets/features/build-basic-styles-source.js b/docs/_snippets/features/build-basic-styles-source.js index b2480f5..565b4d5 100644 --- a/docs/_snippets/features/build-basic-styles-source.js +++ b/docs/_snippets/features/build-basic-styles-source.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals window */ diff --git a/lang/translations/ru.po b/lang/translations/ru.po index abef452..40f5b8e 100644 --- a/lang/translations/ru.po +++ b/lang/translations/ru.po @@ -38,8 +38,8 @@ msgstr "Зачеркнутый" msgctxt "Toolbar button tooltip for the Subscript feature." msgid "Subscript" -msgstr "" +msgstr "Подстрочный" msgctxt "Toolbar button tooltip for the Superscript feature." msgid "Superscript" -msgstr "" +msgstr "Надстрочный" diff --git a/lang/translations/sr-latn.po b/lang/translations/sr-latn.po new file mode 100644 index 0000000..8c5ab66 --- /dev/null +++ b/lang/translations/sr-latn.po @@ -0,0 +1,45 @@ +# Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. +# +# !!! IMPORTANT !!! +# +# Before you edit this file, please keep in mind that contributing to the project +# translations is possible ONLY via the Transifex online service. +# +# To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5. +# +# To learn more, check out the official contributor's guide: +# https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html +# +msgid "" +msgstr "" +"Language-Team: Serbian (Latin) (https://www.transifex.com/ckeditor/teams/11143/sr@latin/)\n" +"Language: sr@latin\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +msgctxt "Toolbar button tooltip for the Bold feature." +msgid "Bold" +msgstr "Podebljano" + +msgctxt "Toolbar button tooltip for the Italic feature." +msgid "Italic" +msgstr "Kurziv" + +msgctxt "Toolbar button tooltip for the Underline feature." +msgid "Underline" +msgstr "Podvučen" + +msgctxt "Toolbar button tooltip for the Code feature." +msgid "Code" +msgstr "Kod" + +msgctxt "Toolbar button tooltip for the Strikethrough feature." +msgid "Strikethrough" +msgstr "Precrtan" + +msgctxt "Toolbar button tooltip for the Subscript feature." +msgid "Subscript" +msgstr "Index dole" + +msgctxt "Toolbar button tooltip for the Superscript feature." +msgid "Superscript" +msgstr "Index gore" diff --git a/lang/translations/sr.po b/lang/translations/sr.po new file mode 100644 index 0000000..b5f375b --- /dev/null +++ b/lang/translations/sr.po @@ -0,0 +1,45 @@ +# Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. +# +# !!! IMPORTANT !!! +# +# Before you edit this file, please keep in mind that contributing to the project +# translations is possible ONLY via the Transifex online service. +# +# To submit your translations, visit https://www.transifex.com/ckeditor/ckeditor5. +# +# To learn more, check out the official contributor's guide: +# https://ckeditor.com/docs/ckeditor5/latest/framework/guides/contributing/contributing.html +# +msgid "" +msgstr "" +"Language-Team: Serbian (https://www.transifex.com/ckeditor/teams/11143/sr/)\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +msgctxt "Toolbar button tooltip for the Bold feature." +msgid "Bold" +msgstr "Подебљано" + +msgctxt "Toolbar button tooltip for the Italic feature." +msgid "Italic" +msgstr "Курзив" + +msgctxt "Toolbar button tooltip for the Underline feature." +msgid "Underline" +msgstr "Подвучен" + +msgctxt "Toolbar button tooltip for the Code feature." +msgid "Code" +msgstr "Код" + +msgctxt "Toolbar button tooltip for the Strikethrough feature." +msgid "Strikethrough" +msgstr "Прецртан" + +msgctxt "Toolbar button tooltip for the Subscript feature." +msgid "Subscript" +msgstr "Индекс доле" + +msgctxt "Toolbar button tooltip for the Superscript feature." +msgid "Superscript" +msgstr "Индекс горе" diff --git a/package.json b/package.json index 49723a6..114fe19 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@ckeditor/ckeditor5-basic-styles", - "version": "11.0.0", + "version": "11.1.0", "description": "Basic styles feature for CKEditor 5.", "keywords": [ "ckeditor", @@ -10,15 +10,15 @@ "ckeditor5-plugin" ], "dependencies": { - "@ckeditor/ckeditor5-core": "^12.0.0", - "@ckeditor/ckeditor5-ui": "^12.0.0" + "@ckeditor/ckeditor5-core": "^12.1.0", + "@ckeditor/ckeditor5-ui": "^12.1.0" }, "devDependencies": { - "@ckeditor/ckeditor5-editor-classic": "^12.0.0", - "@ckeditor/ckeditor5-engine": "^13.0.0", - "@ckeditor/ckeditor5-essentials": "^11.0.0", - "@ckeditor/ckeditor5-paragraph": "^11.0.0", - "@ckeditor/ckeditor5-utils": "^12.0.0", + "@ckeditor/ckeditor5-editor-classic": "^12.1.0", + "@ckeditor/ckeditor5-engine": "^13.1.0", + "@ckeditor/ckeditor5-essentials": "^11.0.1", + "@ckeditor/ckeditor5-paragraph": "^11.0.1", + "@ckeditor/ckeditor5-utils": "^12.1.0", "eslint": "^5.5.0", "eslint-config-ckeditor5": "^1.0.11", "husky": "^1.3.1", diff --git a/src/attributecommand.js b/src/attributecommand.js index fcae173..7ae21d6 100644 --- a/src/attributecommand.js +++ b/src/attributecommand.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/bold.js b/src/bold.js index 063c105..ca8eab5 100644 --- a/src/bold.js +++ b/src/bold.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/bold/boldediting.js b/src/bold/boldediting.js index 60da082..50f61e1 100644 --- a/src/bold/boldediting.js +++ b/src/bold/boldediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -28,6 +28,7 @@ export default class BoldEditing extends Plugin { const editor = this.editor; // Allow bold attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: BOLD } ); + editor.model.schema.setAttributeProperties( BOLD, { isFormatting: true } ); // Build converter from model to view for data and editing pipelines. diff --git a/src/bold/boldui.js b/src/bold/boldui.js index 375db73..55d7d61 100644 --- a/src/bold/boldui.js +++ b/src/bold/boldui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/code.js b/src/code.js index 6ef0a36..57d8346 100644 --- a/src/code.js +++ b/src/code.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/code/codeediting.js b/src/code/codeediting.js index 1a52de1..ecda4ed 100644 --- a/src/code/codeediting.js +++ b/src/code/codeediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -29,6 +29,7 @@ export default class CodeEditing extends Plugin { // Allow code attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: CODE } ); + editor.model.schema.setAttributeProperties( CODE, { isFormatting: true } ); editor.conversion.attributeToElement( { model: CODE, diff --git a/src/code/codeui.js b/src/code/codeui.js index c90c551..530815c 100644 --- a/src/code/codeui.js +++ b/src/code/codeui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/italic.js b/src/italic.js index 60e118c..da04321 100644 --- a/src/italic.js +++ b/src/italic.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/italic/italicediting.js b/src/italic/italicediting.js index 72cd210..1092bcd 100644 --- a/src/italic/italicediting.js +++ b/src/italic/italicediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -29,6 +29,7 @@ export default class ItalicEditing extends Plugin { // Allow italic attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: ITALIC } ); + editor.model.schema.setAttributeProperties( ITALIC, { isFormatting: true } ); editor.conversion.attributeToElement( { model: ITALIC, diff --git a/src/italic/italicui.js b/src/italic/italicui.js index 95e2194..c6f7bd3 100644 --- a/src/italic/italicui.js +++ b/src/italic/italicui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/strikethrough.js b/src/strikethrough.js index b6197b0..9028ba8 100644 --- a/src/strikethrough.js +++ b/src/strikethrough.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/strikethrough/strikethroughediting.js b/src/strikethrough/strikethroughediting.js index 8393a2f..d398d48 100644 --- a/src/strikethrough/strikethroughediting.js +++ b/src/strikethrough/strikethroughediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -30,6 +30,7 @@ export default class StrikethroughEditing extends Plugin { // Allow strikethrough attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: STRIKETHROUGH } ); + editor.model.schema.setAttributeProperties( STRIKETHROUGH, { isFormatting: true } ); editor.conversion.attributeToElement( { model: STRIKETHROUGH, diff --git a/src/strikethrough/strikethroughui.js b/src/strikethrough/strikethroughui.js index cdcea7f..616283f 100644 --- a/src/strikethrough/strikethroughui.js +++ b/src/strikethrough/strikethroughui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/subscript.js b/src/subscript.js index 8e341c0..764ac80 100644 --- a/src/subscript.js +++ b/src/subscript.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/subscript/subscriptediting.js b/src/subscript/subscriptediting.js index 7624679..21ffab8 100644 --- a/src/subscript/subscriptediting.js +++ b/src/subscript/subscriptediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -28,6 +28,7 @@ export default class SubscriptEditing extends Plugin { const editor = this.editor; // Allow sub attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: SUBSCRIPT } ); + editor.model.schema.setAttributeProperties( SUBSCRIPT, { isFormatting: true } ); // Build converter from model to view for data and editing pipelines. diff --git a/src/subscript/subscriptui.js b/src/subscript/subscriptui.js index 5a3201a..69e2e20 100644 --- a/src/subscript/subscriptui.js +++ b/src/subscript/subscriptui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/superscript.js b/src/superscript.js index f54c6d1..10b67e9 100644 --- a/src/superscript.js +++ b/src/superscript.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/superscript/superscriptediting.js b/src/superscript/superscriptediting.js index 63fc8b9..7e6c02e 100644 --- a/src/superscript/superscriptediting.js +++ b/src/superscript/superscriptediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -28,6 +28,7 @@ export default class SuperscriptEditing extends Plugin { const editor = this.editor; // Allow super attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: SUPERSCRIPT } ); + editor.model.schema.setAttributeProperties( SUPERSCRIPT, { isFormatting: true } ); // Build converter from model to view for data and editing pipelines. diff --git a/src/superscript/superscriptui.js b/src/superscript/superscriptui.js index 022da5c..5965116 100644 --- a/src/superscript/superscriptui.js +++ b/src/superscript/superscriptui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/underline.js b/src/underline.js index edf8cad..689a5c4 100644 --- a/src/underline.js +++ b/src/underline.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/src/underline/underlineediting.js b/src/underline/underlineediting.js index 561e63b..c8e8aef 100644 --- a/src/underline/underlineediting.js +++ b/src/underline/underlineediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** @@ -29,6 +29,7 @@ export default class UnderlineEditing extends Plugin { // Allow strikethrough attribute on text nodes. editor.model.schema.extend( '$text', { allowAttributes: UNDERLINE } ); + editor.model.schema.setAttributeProperties( UNDERLINE, { isFormatting: true } ); editor.conversion.attributeToElement( { model: UNDERLINE, diff --git a/src/underline/underlineui.js b/src/underline/underlineui.js index 6c10541..0d5bb6c 100644 --- a/src/underline/underlineui.js +++ b/src/underline/underlineui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /** diff --git a/tests/attributecommand.js b/tests/attributecommand.js index cd96e98..72ff461 100644 --- a/tests/attributecommand.js +++ b/tests/attributecommand.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import AttributeCommand from '../src/attributecommand'; diff --git a/tests/bold.js b/tests/bold.js index 4b88f91..b74c5db 100644 --- a/tests/bold.js +++ b/tests/bold.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Bold from '../src/bold'; diff --git a/tests/bold/boldediting.js b/tests/bold/boldediting.js index e918cd5..5e5bb5a 100644 --- a/tests/bold/boldediting.js +++ b/tests/bold/boldediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import BoldEditing from '../../src/bold/boldediting'; @@ -40,6 +40,12 @@ describe( 'BoldEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'bold' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'bold' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + it( 'should set editor keystroke', () => { const spy = sinon.spy( editor, 'execute' ); const keyEventData = { diff --git a/tests/bold/boldui.js b/tests/bold/boldui.js index 36ae62d..bb6c21b 100644 --- a/tests/bold/boldui.js +++ b/tests/bold/boldui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/tests/code.js b/tests/code.js index 27fe4b0..a4b7281 100644 --- a/tests/code.js +++ b/tests/code.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Code from '../src/code'; diff --git a/tests/code/codeediting.js b/tests/code/codeediting.js index e9e7ee2..33b968d 100644 --- a/tests/code/codeediting.js +++ b/tests/code/codeediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import CodeEditing from '../../src/code/codeediting'; @@ -39,6 +39,12 @@ describe( 'CodeEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'code' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'code' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + describe( 'command', () => { it( 'should register code command', () => { const command = editor.commands.get( 'code' ); diff --git a/tests/code/codeui.js b/tests/code/codeui.js index ec83f1d..89a1e06 100644 --- a/tests/code/codeui.js +++ b/tests/code/codeui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/tests/italic.js b/tests/italic.js index 8116367..aa09bbd 100644 --- a/tests/italic.js +++ b/tests/italic.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Italic from '../src/italic'; diff --git a/tests/italic/italicediting.js b/tests/italic/italicediting.js index 61bf465..5b9f1a5 100644 --- a/tests/italic/italicediting.js +++ b/tests/italic/italicediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import ItalicEditing from '../../src/italic/italicediting'; @@ -39,6 +39,12 @@ describe( 'ItalicEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'italic' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'italic' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + describe( 'command', () => { it( 'should register italic command', () => { const command = editor.commands.get( 'italic' ); diff --git a/tests/italic/italicui.js b/tests/italic/italicui.js index bfaa6ae..33fd5c4 100644 --- a/tests/italic/italicui.js +++ b/tests/italic/italicui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/tests/manual/basic-styles.js b/tests/manual/basic-styles.js index 828518e..f7c1cda 100644 --- a/tests/manual/basic-styles.js +++ b/tests/manual/basic-styles.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals console:false, window, document */ diff --git a/tests/strikethrough.js b/tests/strikethrough.js index de32b55..8e7f33a 100644 --- a/tests/strikethrough.js +++ b/tests/strikethrough.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Strikethrough from '../src/strikethrough'; diff --git a/tests/strikethrough/strikethroughediting.js b/tests/strikethrough/strikethroughediting.js index 3960a55..c2d39a9 100644 --- a/tests/strikethrough/strikethroughediting.js +++ b/tests/strikethrough/strikethroughediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import StrikethroughEditing from '../../src/strikethrough/strikethroughediting'; @@ -39,6 +39,12 @@ describe( 'StrikethroughEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'strikethrough' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'strikethrough' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + describe( 'command', () => { it( 'should register strikethrough command', () => { const command = editor.commands.get( 'strikethrough' ); diff --git a/tests/strikethrough/strikethroughui.js b/tests/strikethrough/strikethroughui.js index af7d992..759d034 100644 --- a/tests/strikethrough/strikethroughui.js +++ b/tests/strikethrough/strikethroughui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/tests/subscript.js b/tests/subscript.js index 3525479..1f7fbca 100644 --- a/tests/subscript.js +++ b/tests/subscript.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Subscript from '../src/subscript'; diff --git a/tests/subscript/subscriptediting.js b/tests/subscript/subscriptediting.js index 9ef8dff..86a58f7 100644 --- a/tests/subscript/subscriptediting.js +++ b/tests/subscript/subscriptediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import SubEditing from '../../src/subscript/subscriptediting'; @@ -39,6 +39,12 @@ describe( 'SubEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'subscript' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'subscript' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + describe( 'command', () => { it( 'should register subscript command', () => { const command = editor.commands.get( 'subscript' ); diff --git a/tests/subscript/subscriptui.js b/tests/subscript/subscriptui.js index 0a4296c..e077386 100644 --- a/tests/subscript/subscriptui.js +++ b/tests/subscript/subscriptui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/tests/superscript.js b/tests/superscript.js index 7ff0309..d82e3c7 100644 --- a/tests/superscript.js +++ b/tests/superscript.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Superscript from '../src/superscript'; diff --git a/tests/superscript/superscriptediting.js b/tests/superscript/superscriptediting.js index e41ea4b..e0da6ba 100644 --- a/tests/superscript/superscriptediting.js +++ b/tests/superscript/superscriptediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import SuperEditing from '../../src/superscript/superscriptediting'; @@ -39,6 +39,12 @@ describe( 'SuperEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'superscript' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'superscript' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + describe( 'command', () => { it( 'should register superscript command', () => { const command = editor.commands.get( 'superscript' ); diff --git a/tests/superscript/superscriptui.js b/tests/superscript/superscriptui.js index 18a6452..28b4cc9 100644 --- a/tests/superscript/superscriptui.js +++ b/tests/superscript/superscriptui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/tests/underline.js b/tests/underline.js index 975a4ad..8eaf14a 100644 --- a/tests/underline.js +++ b/tests/underline.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import Underline from '../src/underline'; diff --git a/tests/underline/underlineediting.js b/tests/underline/underlineediting.js index e25da30..548c5ce 100644 --- a/tests/underline/underlineediting.js +++ b/tests/underline/underlineediting.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ import UnderlineEditing from '../../src/underline/underlineediting'; @@ -39,6 +39,12 @@ describe( 'UnderlineEditing', () => { expect( model.schema.checkAttribute( [ '$clipboardHolder', '$text' ], 'underline' ) ).to.be.true; } ); + it( 'should be marked with a formatting property', () => { + expect( model.schema.getAttributeProperties( 'underline' ) ).to.deep.equal( { + isFormatting: true + } ); + } ); + describe( 'command', () => { it( 'should register underline command', () => { const command = editor.commands.get( 'underline' ); diff --git a/tests/underline/underlineui.js b/tests/underline/underlineui.js index 186a264..9e4dc4b 100644 --- a/tests/underline/underlineui.js +++ b/tests/underline/underlineui.js @@ -1,6 +1,6 @@ /** * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ /* globals document */ diff --git a/theme/code.css b/theme/code.css index c862fa1..9375d0c 100644 --- a/theme/code.css +++ b/theme/code.css @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.md. + * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license */ .ck-content code { diff --git a/theme/icons/strikethrough.svg b/theme/icons/strikethrough.svg index 8544bf6..87141d6 100644 --- a/theme/icons/strikethrough.svg +++ b/theme/icons/strikethrough.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/theme/icons/underline.svg b/theme/icons/underline.svg index 2c8c8f4..e26f1a3 100644 --- a/theme/icons/underline.svg +++ b/theme/icons/underline.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file