Преглед изворни кода

Merge branch 'master' into t/ckeditor5/1490

# Conflicts:
#	package.json
Maciej Gołaszewski пре 6 година
родитељ
комит
380f2a78a8

+ 1 - 3
packages/ckeditor5-typing/.travis.yml

@@ -28,6 +28,4 @@ after_script:
 - ckeditor5-dev-tests-notify-travis-status
 env:
   global:
-  - secure: sgO6VC3Bn9qK+da6p4nF5jj+fYUaDQRUchajKd2GsxRl0zjxljuoxQCYi0lhI2mlcfvNSDt+aF/cYFczECt6pf8vTudXeCEfM1ecAf4UQ5NVgIp71bBZdxrKyVwbe37EYL+IO2KFMnZqH1OR6WS0TW9VOt6Ia8PBsZSvOXQ4C8WCc+uEkFqUdfvkqy3t2CNYGILa8MVQs85WJTe9NFRQqVve67S8ayL4UvYpXHdeYDCgbt7CbhQU7jwIYNmw1B0JsQOWXxE7vJiKsn60fLP7+V3S23jfPI+r2pWW6lCTBrUM7/u06JUoze1SrAAlVjY4c3/tYEfiiUjNvfNphC501Orpaub7u2U74ZTOlUgAMy9MLCKBV28gQfyR5erFBFkSifbHRD6BxXLpmjtC03RIxyBNHPxLkzSz1Bz+oe6rxuS4J6f+M17ZF6e5E3AcI76hpNZgTSHOqnHAZ6IgEiOMLL/070JWBoq40uHaOhDWYvTEHB/hYpiLMnVP00gABb8tvrtQst3woFRFJqQzmu/EMAkMGXgpvPaTpm2FYJCfOPKoLvutVoqZR18IoSKEZ88mLsSco5J1t2NKeczukKMP1po0+lXgkRj/xtqEXAz9HWPDmi2rBXk+qvBeMNT6d4YPV5fk1YoIC3xPEtmPOOEhz+dWoc7MpOFeULVNwrqlOXQ=
-  - secure: I48fZzp10VFbXD4pPvjdxSM7VKo9mkrQ2Bu/JP5zSwdRlVEW+vJI/yKC6t5//5gCp/XC0vibaxdmbg73fvJUYvcAGc/yBKChGfR1sjt10kTQYcUwbuVuE4vlStbD3td4vhEZMOL4k0b11tNsuUe43WLJsqdQ3/Znr6sD/+VAlJBUXKUQRGhpAwgw0rpL5U/3wCPbhjmA4SSMUlWjPIPFeWIUcCBEWruk2WjZ3OgYrjcnSw1tQ3LNZgYydaS1XT5MQbU9YeIEmTKWOXJVCTZ8hGYdeubZ10v9KrkFj/lny3m5XiU+Ae+rhV0LJpFuYl1XD897xXrquo4zTSk+Txu95NxfMFdLtt9nfZ+2y+oEUx8qUGxO+dXeg9vtITaa6QL/kWxofmprDurSZqGW+BicSRK7FxShhQZtJ4VKYe2976edIeNOqFtpP9iLOuVKt9LIsuqmbDSDMlC7RnVg33FbEiyOsrXzw/3gYQEyVymiUWUWX8vET6k7O8iz25wufHO4tAIZDG44R4HdCSYXlMHXGHqDQjfYXFxIA88hH1mCk3/EVDjn6ZEqf2nw8r5sUU3CPHXHVv/Ap1UylUvkdLb3GF6MTIdICGE/d5cmbx3T63o0xpDYO1SmeZZ/nIicmdgmK2Ny3hMjTCv33J1Ra3bAv0t2/vJ7/dZU+kgMXfgaXYo=
-  - secure: J2J9FF8cT68skHZms+Z7JGRx31jRAhV6B62PC38d3x/Bz8p5c0Oc48mMPeyvY9y/3K4jjm1T34MHKdT2/m06KCvZvBNZQwyptu7BK5C2wnCa1zf4Reh5K5zkQ8zDwU46DFvhEfThDvtvqfgugkMU+4wedYxTl3JXKWpCdZJAMeqtObrtxU89QX6tr1HzpUS3pmUYQbC6/5CLmDnRpzafY6nMpuzhNUxGSPb/8+ZckfkmburoLtpGryOUlVoGGfZkEcDESHATu8N4lJcAXwIQybF1qGoGKs556UfCkfse73yvsV9SW4CzkfmCE2yWG32c0XWiLpRHxTHtBMAStSCa6Xk8QKyxO83agt6a9dkFI1P7mCBjySHmlzRDQ5PmR2z9XlBfrxTapisppmMnvHpLOkqkDljLm8wRSH81fW/3Wjee0UmWNocV72Px9mrN023zPxYLJjSW71CBVPPkou4Pxn7kk/2sPoYN50N+781KRfka6r6nB5/Ygex1r6bstSwWW9U1q6yDxDKJEeFgikiQnn/cPxwAkF2pZRVOlly7MmgS9LbyiSkoW96x68TpG//BCCIzIqJE6WRvqIGHXc6BqVS2gl6k2zcHQN8Z4KExcS9sSuGN7Y5bCqYSJpXEDZ1SMvwCGUWRFj/FX/lxcg2efOK/sMEHXoMnzcv61tEM2zc=
+  - secure: BUUSMHA3nrY9h2SOHZNnQ0hw51YME2Ku2vg+pys34iRU8CjtAYzt5kLm7VG0sGFV0F1Taj9AHSq8NKgtjNCX8OGk6aNqm4lv9l3o43PUeTmQdv7uB4zhTaCuQJ1N2K9SfSbnhqOibzhL5QUvEi8pCW94FQxg1rIBUgcpswrdnNW1JMErwuXERem6p3adT5PHoO4RG5FJKQTJYnqTtCLVnZcQDs8kxkYVGi+eohasBWZZVQvxOc6W6q8gjz2plDiaFS9M78+B68p9GXVFWxWEsNlty35ftED7zhCRiV2vEBcKknlSzba7WobvR3c+MNIvaW6k/SAsDVHjac1sTvp8X+9AMaWUcLqy6rDLTvVbgVZbiLeU0ribab72e7XzlHrxDBye47P1rxTlr8/jmIUy04EHX4rR51J86Au1UHnHj6SlqH/j72B4jViLRcdujyl6skdUkRHNDh48aCJ74+IEUYSe3jc4HmqK9AwXku6ZVCdMfkCQ/9N3L5E6cSJb5eNZayaqh6u0Y3s9PBS5KoJJLHY6AHz33BznSo9ZPJb4I43nl7dF0K1YPjqt18vmVBgrsJjDi+j1gBsYr3cCU64z3ABgvSNINdpBB+tTL9FkIajkDgZeokrM9ai9uRzL/Ao4zYzq2xA8fPAtm9WvYkY+anKxTCdKJ8fGhigmETDwbPE=

+ 7 - 0
packages/ckeditor5-typing/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## [12.0.2](https://github.com/ckeditor/ckeditor5-typing/compare/v12.0.1...v12.0.2) (2019-06-05)
+
+### Other changes
+
+* Use `Model#insertContent()` instead of `model.Writer#insertText()`. Closes [#191](https://github.com/ckeditor/ckeditor5-typing/issues/191). ([0aeb384](https://github.com/ckeditor/ckeditor5-typing/commit/0aeb384))
+
+
 ## [12.0.1](https://github.com/ckeditor/ckeditor5-typing/compare/v12.0.0...v12.0.1) (2019-04-10)
 
 ### Bug fixes

+ 1 - 2
packages/ckeditor5-typing/README.md

@@ -4,7 +4,6 @@ CKEditor 5 typing feature
 [![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-typing.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-typing)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-typing.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-typing)
-[![BrowserStack Status](https://automate.browserstack.com/automate/badge.svg?badge_key=d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)](https://automate.browserstack.com/public-build/d3hvenZqQVZERFQ5d09FWXdyT0ozVXhLaVltRFRjTTUyZGpvQWNmWVhUUT0tLUZqNlJ1YWRUd0RvdEVOaEptM1B2Q0E9PQ==--c9d3dee40b9b4471ff3fb516d9ecf8d09292c7e0)
 [![Coverage Status](https://coveralls.io/repos/github/ckeditor/ckeditor5-typing/badge.svg?branch=master)](https://coveralls.io/github/ckeditor/ckeditor5-typing?branch=master)
 <br>
 [![Dependency Status](https://david-dm.org/ckeditor/ckeditor5-typing/status.svg)](https://david-dm.org/ckeditor/ckeditor5-typing)
@@ -18,4 +17,4 @@ See the [`@ckeditor/ckeditor5-typing` package](https://ckeditor.com/docs/ckedito
 
 ## License
 
-Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the `LICENSE.md` file.
+Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the `LICENSE.md` file or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license).

+ 16 - 16
packages/ckeditor5-typing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-typing",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "description": "Typing feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -10,23 +10,23 @@
     "ckeditor5-plugin"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^12.1.0",
-    "@ckeditor/ckeditor5-engine": "^13.1.0",
-    "@ckeditor/ckeditor5-mention": "^10.0.0",
-    "@ckeditor/ckeditor5-utils": "^12.1.0"
+    "@ckeditor/ckeditor5-core": "^12.1.1",
+    "@ckeditor/ckeditor5-engine": "^13.1.1",
+    "@ckeditor/ckeditor5-mention": "^11.0.0",
+    "@ckeditor/ckeditor5-utils": "^12.1.1"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^11.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^11.0.1",
-    "@ckeditor/ckeditor5-editor-classic": "^12.1.0",
-    "@ckeditor/ckeditor5-enter": "^11.0.1",
-    "@ckeditor/ckeditor5-essentials": "^11.0.1",
-    "@ckeditor/ckeditor5-heading": "^11.0.1",
-    "@ckeditor/ckeditor5-image": "^13.0.1",
-    "@ckeditor/ckeditor5-link": "^11.0.1",
-    "@ckeditor/ckeditor5-list": "^12.0.1",
-    "@ckeditor/ckeditor5-paragraph": "^11.0.1",
-    "@ckeditor/ckeditor5-undo": "^11.0.1",
+    "@ckeditor/ckeditor5-basic-styles": "^11.1.1",
+    "@ckeditor/ckeditor5-block-quote": "^11.1.0",
+    "@ckeditor/ckeditor5-editor-classic": "^12.1.1",
+    "@ckeditor/ckeditor5-enter": "^11.0.2",
+    "@ckeditor/ckeditor5-essentials": "^11.0.2",
+    "@ckeditor/ckeditor5-heading": "^11.0.2",
+    "@ckeditor/ckeditor5-image": "^13.1.0",
+    "@ckeditor/ckeditor5-link": "^11.0.2",
+    "@ckeditor/ckeditor5-list": "^12.0.2",
+    "@ckeditor/ckeditor5-paragraph": "^11.0.2",
+    "@ckeditor/ckeditor5-undo": "^11.0.2",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^1.0.11",
     "husky": "^1.3.1",

+ 2 - 4
packages/ckeditor5-typing/src/inputcommand.js

@@ -82,12 +82,10 @@ export default class InputCommand extends Command {
 
 			this._buffer.lock();
 
-			if ( !isCollapsedRange ) {
-				model.deleteContent( model.createSelection( range ) );
-			}
+			model.deleteContent( model.createSelection( range ) );
 
 			if ( text ) {
-				writer.insertText( text, doc.selection.getAttributes(), range.start );
+				model.insertContent( writer.createText( text, doc.selection.getAttributes() ), range.start );
 			}
 
 			if ( resultRange ) {