@ckeditor/ckeditor5-paste-from-office
Advanced tools
Comparing version 10.0.0 to 11.0.0
Changelog | ||
========= | ||
## [11.0.0](https://github.com/ckeditor/ckeditor5-paste-from-office/compare/v10.0.0...v11.0.0) (2019-02-28) | ||
### Bug fixes | ||
* Ensured correct lists ordering for separate list items with the same `mso-list` id. Closes [#43](https://github.com/ckeditor/ckeditor5-paste-from-office/issues/43). ([4ebc363](https://github.com/ckeditor/ckeditor5-paste-from-office/commit/4ebc363)) | ||
* Handle "spacerun spans" with mixed whitespaces. Closes [#49](https://github.com/ckeditor/ckeditor5-paste-from-office/issues/49). Closes [#50](https://github.com/ckeditor/ckeditor5-paste-from-office/issues/50). ([7fb132f](https://github.com/ckeditor/ckeditor5-paste-from-office/commit/7fb132f)) | ||
Huge thanks to [Matt Kobs](https://github.com/kobsy) for this contribution! | ||
### BREAKING CHANGES | ||
* Upgraded minimal versions of Node to `8.0.0` and npm to `5.7.1`. See: [ckeditor/ckeditor5#1507](https://github.com/ckeditor/ckeditor5/issues/1507). ([612ea3c](https://github.com/ckeditor/ckeditor5-cloud-services/commit/612ea3c)) | ||
## [10.0.0](https://github.com/ckeditor/ckeditor5-paste-from-office/tree/v10.0.0) (2018-12-05) | ||
Initial implementation of the Paste from Office feature. |
@@ -5,3 +5,3 @@ Software License Agreement | ||
**CKEditor 5 Paste from Office Feature** – https://github.com/ckeditor/ckeditor5-paste-from-office <br> | ||
Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved. | ||
Copyright (c) 2003-2019, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved. | ||
@@ -8,0 +8,0 @@ Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). |
{ | ||
"name": "@ckeditor/ckeditor5-paste-from-office", | ||
"version": "10.0.0", | ||
"version": "11.0.0", | ||
"description": "Paste from Office feature for CKEditor 5.", | ||
@@ -13,31 +13,31 @@ "keywords": [ | ||
"dependencies": { | ||
"@ckeditor/ckeditor5-clipboard": "^10.0.4", | ||
"@ckeditor/ckeditor5-core": "^11.1.0", | ||
"@ckeditor/ckeditor5-engine": "^12.0.0" | ||
"@ckeditor/ckeditor5-clipboard": "^11.0.0", | ||
"@ckeditor/ckeditor5-core": "^12.0.0", | ||
"@ckeditor/ckeditor5-engine": "^13.0.0" | ||
}, | ||
"devDependencies": { | ||
"@ckeditor/ckeditor5-basic-styles": "^10.1.0", | ||
"@ckeditor/ckeditor5-cloud-services": "^10.1.1", | ||
"@ckeditor/ckeditor5-easy-image": "^10.0.4", | ||
"@ckeditor/ckeditor5-editor-classic": "^11.0.2", | ||
"@ckeditor/ckeditor5-enter": "^10.1.3", | ||
"@ckeditor/ckeditor5-heading": "^10.1.1", | ||
"@ckeditor/ckeditor5-image": "^12.0.0", | ||
"@ckeditor/ckeditor5-link": "^10.1.0", | ||
"@ckeditor/ckeditor5-list": "^11.0.3", | ||
"@ckeditor/ckeditor5-paragraph": "^10.0.4", | ||
"@ckeditor/ckeditor5-table": "^11.0.1", | ||
"@ckeditor/ckeditor5-utils": "^11.1.0", | ||
"@ckeditor/ckeditor5-basic-styles": "^11.0.0", | ||
"@ckeditor/ckeditor5-cloud-services": "^11.0.0", | ||
"@ckeditor/ckeditor5-easy-image": "^11.0.0", | ||
"@ckeditor/ckeditor5-editor-classic": "^12.0.0", | ||
"@ckeditor/ckeditor5-enter": "^11.0.0", | ||
"@ckeditor/ckeditor5-heading": "^11.0.0", | ||
"@ckeditor/ckeditor5-image": "^13.0.0", | ||
"@ckeditor/ckeditor5-link": "^11.0.0", | ||
"@ckeditor/ckeditor5-list": "^12.0.0", | ||
"@ckeditor/ckeditor5-paragraph": "^11.0.0", | ||
"@ckeditor/ckeditor5-table": "^12.0.0", | ||
"@ckeditor/ckeditor5-utils": "^12.0.0", | ||
"eslint": "^5.5.0", | ||
"eslint-config-ckeditor5": "^1.0.7", | ||
"husky": "^0.14.3", | ||
"eslint-config-ckeditor5": "^1.0.11", | ||
"husky": "^1.3.1", | ||
"lint-staged": "^7.0.0" | ||
}, | ||
"engines": { | ||
"node": ">=6.9.0", | ||
"npm": ">=3.0.0" | ||
"node": ">=8.0.0", | ||
"npm": ">=5.7.1" | ||
}, | ||
"author": "CKSource (http://cksource.com/)", | ||
"license": "GPL-2.0-or-later", | ||
"homepage": "https://ckeditor.com", | ||
"homepage": "https://ckeditor.com/ckeditor-5", | ||
"bugs": "https://github.com/ckeditor/ckeditor5-paste-from-office/issues", | ||
@@ -54,4 +54,3 @@ "repository": { | ||
"scripts": { | ||
"lint": "eslint --quiet '**/*.js'", | ||
"precommit": "lint-staged" | ||
"lint": "eslint --quiet '**/*.js'" | ||
}, | ||
@@ -66,3 +65,8 @@ "lint-staged": { | ||
"packages/**" | ||
] | ||
], | ||
"husky": { | ||
"hooks": { | ||
"pre-commit": "lint-staged" | ||
} | ||
} | ||
} |
/** | ||
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved. | ||
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. | ||
* For licensing, see LICENSE.md. | ||
@@ -4,0 +4,0 @@ */ |
/** | ||
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved. | ||
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. | ||
* For licensing, see LICENSE.md. | ||
@@ -169,3 +169,3 @@ */ | ||
// | ||
// * `l1` is a list id (all elements with the same id belongs to the same list), | ||
// * `l1` is a list id (however it does not mean this is a continuous list - see #43), | ||
// * `level1` is a list item indentation level, | ||
@@ -214,4 +214,21 @@ // * `lfo1` is a list insertion order in a document. | ||
// Whether previous and current item belongs to the same list. It is determined based on `item.id` | ||
// (extracted from `mso-list` style, see #getListItemData) and previous sibling of the current item. | ||
// | ||
// @param {Object} previousItem | ||
// @param {Object} currentItem | ||
// @returns {Boolean} | ||
function isNewListNeeded( previousItem, currentItem ) { | ||
return previousItem.id !== currentItem.id; | ||
if ( previousItem.id !== currentItem.id ) { | ||
return true; | ||
} | ||
const previousSibling = currentItem.element.previousSibling; | ||
if ( !previousSibling ) { | ||
return true; | ||
} | ||
// Even with the same id the list does not have to be continuous (#43). | ||
return !previousSibling.is( 'ul' ) && !previousSibling.is( 'ol' ); | ||
} |
/** | ||
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved. | ||
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. | ||
* For licensing, see LICENSE.md. | ||
@@ -4,0 +4,0 @@ */ |
/** | ||
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved. | ||
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. | ||
* For licensing, see LICENSE.md. | ||
@@ -20,6 +20,11 @@ */ | ||
export function normalizeSpacing( htmlString ) { | ||
return normalizeSafariSpaceSpans( normalizeSafariSpaceSpans( htmlString ) ) // Run normalization two times to cover nested spans. | ||
// Run normalizeSafariSpaceSpans() two times to cover nested spans. | ||
return normalizeSafariSpaceSpans( normalizeSafariSpaceSpans( htmlString ) ) | ||
// Remove all \r\n from "spacerun spans" so the last replace line doesn't strip all whitespaces. | ||
.replace( /(<span style=['"]mso-spacerun:yes['"]>[\s]*?)[\r\n]+(\s*<\/span>)/g, '$1$2' ) | ||
.replace( /<span style=['"]mso-spacerun:yes['"]><\/span>/g, '' ) | ||
.replace( / <\//g, '\u00A0</' ) | ||
.replace( / <o:p><\/o:p>/g, '\u00A0<o:p></o:p>' ) | ||
.replace( />(\s*(\r\n?|\n)\s*)+</g, '><' ); | ||
// Remove all whitespaces when they contain any \r or \n. | ||
.replace( />(\s*[\r\n]\s*)</g, '><' ); | ||
} | ||
@@ -26,0 +31,0 @@ |
/** | ||
* @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved. | ||
* @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved. | ||
* For licensing, see LICENSE.md. | ||
@@ -4,0 +4,0 @@ */ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
33185
595
0
+ Added@ckeditor/ckeditor5-clipboard@11.0.2(transitive)
+ Added@ckeditor/ckeditor5-core@12.3.0(transitive)
+ Added@ckeditor/ckeditor5-engine@13.2.114.0.0(transitive)
+ Added@ckeditor/ckeditor5-utils@12.1.113.0.114.0.0(transitive)
+ Addedckeditor5@12.4.0(transitive)
- Removed@ckeditor/ckeditor5-clipboard@10.0.4(transitive)
- Removed@ckeditor/ckeditor5-core@11.1.0(transitive)
- Removed@ckeditor/ckeditor5-engine@12.0.0(transitive)
- Removed@ckeditor/ckeditor5-utils@11.1.0(transitive)
- Removedckeditor5@11.2.0(transitive)