8
0
Просмотр исходного кода

Merge branch 'master' into memory-test

Maciej Gołaszewski 5 лет назад
Родитель
Сommit
55ab396e67
3 измененных файлов с 6 добавлено и 6 удалено
  1. 1 1
      docs/assets/snippet.js
  2. 3 3
      package.json
  3. 2 2
      packages/ckeditor5-table/src/ui/utils.js

+ 1 - 1
docs/assets/snippet.js

@@ -51,7 +51,7 @@ function createClipboardInputNotification() {
 	<p>Please bear in mind that the editor demo to which you try to paste does not have all the features enabled.
 		Due to that, unsupported formatting is being stripped.</p>
 	<p>Check out the <a href="/docs/ckeditor5/latest/features/pasting/paste-from-word.html">Paste from Word</a> or
-	<a href="/docs/ckeditor5/latest/pasting/paste-from-google-docs.html">Paste from Google Docs</a>
+	<a href="/docs/ckeditor5/latest/features/pasting/paste-from-google-docs.html">Paste from Google Docs</a>
 	demos for the best experience.</p>`;
 
 	window.createNotification( title, message );

+ 3 - 3
package.json

@@ -76,7 +76,7 @@
     "@ckeditor/ckeditor5-word-count": "^19.0.1"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-comments": "^19.0.1",
+    "@ckeditor/ckeditor5-comments": "^19.0.2",
     "@ckeditor/ckeditor5-dev-docs": "^20.0.0",
     "@ckeditor/ckeditor5-dev-env": "^20.1.0",
     "@ckeditor/ckeditor5-dev-tests": "^20.0.1",
@@ -84,8 +84,8 @@
     "@ckeditor/ckeditor5-dev-webpack-plugin": "^20.0.0",
     "@ckeditor/ckeditor5-inspector": "^2.0.0",
     "@ckeditor/ckeditor5-react": "^1.1.3",
-    "@ckeditor/ckeditor5-real-time-collaboration": "^19.0.1",
-    "@ckeditor/ckeditor5-track-changes": "^19.0.1",
+    "@ckeditor/ckeditor5-real-time-collaboration": "^19.0.2",
+    "@ckeditor/ckeditor5-track-changes": "^19.1.0",
     "@wiris/mathtype-ckeditor5": "^7.19.0",
     "babel-standalone": "^6.26.0",
     "coveralls": "^3.1.0",

+ 2 - 2
packages/ckeditor5-table/src/ui/utils.js

@@ -27,7 +27,7 @@ const BALLOON_POSITIONS = [
 	DEFAULT_BALLOON_POSITIONS.southArrowNorthWest,
 	DEFAULT_BALLOON_POSITIONS.southArrowNorthEast
 ];
-const TABLE_PROPERTRIES_BALLOON_POSITIONS = [
+const TABLE_PROPERTIES_BALLOON_POSITIONS = [
 	...BALLOON_POSITIONS,
 	centeredBalloonPositionForLongWidgets
 ];
@@ -74,7 +74,7 @@ export function getBalloonTablePositionData( editor ) {
 
 	return {
 		target: editor.editing.view.domConverter.viewToDom( viewTable ),
-		positions: TABLE_PROPERTRIES_BALLOON_POSITIONS
+		positions: TABLE_PROPERTIES_BALLOON_POSITIONS
 	};
 }