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

Merge branch 'master' into t/ckeditor5/645

Aleksander Nowodzinski 7 лет назад
Родитель
Сommit
05329747c6

+ 2 - 2
packages/ckeditor5-link/src/linkcommand.js

@@ -70,7 +70,7 @@ export default class LinkCommand extends Command {
 					writer.setAttribute( 'linkHref', href, linkRange );
 
 					// Create new range wrapping changed link.
-					selection.setRanges( [ linkRange ] );
+					writer.setSelection( linkRange );
 				}
 				// If not then insert text node with `linkHref` attribute in place of caret.
 				else {
@@ -83,7 +83,7 @@ export default class LinkCommand extends Command {
 					writer.insert( node, position );
 
 					// Create new range wrapping created node.
-					selection.setRanges( [ Range.createOn( node ) ] );
+					writer.setSelection( Range.createOn( node ) );
 				}
 			} else {
 				// If selection has non-collapsed ranges, we change attribute on nodes inside those ranges

+ 8 - 7
packages/ckeditor5-link/tests/link.js

@@ -18,7 +18,7 @@ import LinkActionsView from '../src/ui/linkactionsview';
 import ContextualBalloon from '@ckeditor/ckeditor5-ui/src/panel/balloon/contextualballoon';
 import ButtonView from '@ckeditor/ckeditor5-ui/src/button/buttonview';
 
-import ViewRange from '@ckeditor/ckeditor5-engine/src/view/range';
+import Range from '@ckeditor/ckeditor5-engine/src/view/range';
 import ClickObserver from '@ckeditor/ckeditor5-engine/src/view/observer/clickobserver';
 
 testUtils.createSinonSandbox();
@@ -257,7 +257,7 @@ describe( 'Link', () => {
 				const text = root.getChild( 0 ).getChild( 0 ).getChild( 0 );
 
 				// Move selection to foo[].
-				viewDocument.selection.setRanges( [ ViewRange.createFromParentsAndOffsets( text, 3, text, 3 ) ], true );
+				viewDocument.selection.setTo( Range.createFromParentsAndOffsets( text, 3, text, 3 ), true );
 				viewDocument.render();
 
 				sinon.assert.calledOnce( spy );
@@ -279,7 +279,7 @@ describe( 'Link', () => {
 				const root = viewDocument.getRoot();
 				const text = root.getChild( 0 ).getChild( 0 );
 
-				viewDocument.selection.setRanges( [ ViewRange.createFromParentsAndOffsets( text, 3, text, 3 ) ], true );
+				viewDocument.selection.setTo( Range.createFromParentsAndOffsets( text, 3, text, 3 ), true );
 				viewDocument.render();
 
 				sinon.assert.calledOnce( spy );
@@ -303,7 +303,7 @@ describe( 'Link', () => {
 				const text = root.getChild( 0 ).getChild( 1 );
 
 				// Move selection to b[]ar.
-				viewDocument.selection.setRanges( [ ViewRange.createFromParentsAndOffsets( text, 1, text, 1 ) ], true );
+				viewDocument.selection.setTo( Range.createFromParentsAndOffsets( text, 1, text, 1 ), true );
 				viewDocument.render();
 
 				sinon.assert.calledOnce( spyHide );
@@ -324,8 +324,8 @@ describe( 'Link', () => {
 				const root = viewDocument.getRoot();
 				const text = root.getChild( 0 ).getChild( 0 ).getChild( 0 );
 
-				// Move selection to f[o]o.
-				viewDocument.selection.setRanges( [ ViewRange.createFromParentsAndOffsets( text, 1, text, 2 ) ], true );
+				// Move selection to b[]az.
+				viewDocument.selection.setTo( Range.createFromParentsAndOffsets( text, 1, text, 1 ), true );
 				viewDocument.render();
 
 				sinon.assert.calledOnce( spyHide );
@@ -347,7 +347,8 @@ describe( 'Link', () => {
 				const root = viewDocument.getRoot();
 				const text = root.getChild( 1 ).getChild( 0 );
 
-				viewDocument.selection.setRanges( [ ViewRange.createFromParentsAndOffsets( text, 3, text, 3 ) ], true );
+				// Move selection to f[o]o.
+				viewDocument.selection.setTo( Range.createFromParentsAndOffsets( text, 1, text, 2 ), true );
 				viewDocument.render();
 
 				sinon.assert.calledOnce( spyHide );

+ 4 - 4
packages/ckeditor5-link/tests/unlinkcommand.js

@@ -36,16 +36,16 @@ describe( 'UnlinkCommand', () => {
 
 	describe( 'isEnabled', () => {
 		it( 'should be true when selection has `linkHref` attribute', () => {
-			model.change( () => {
-				document.selection.setAttribute( 'linkHref', 'value' );
+			model.change( writer => {
+				writer.setSelectionAttribute( 'linkHref', 'value' );
 			} );
 
 			expect( command.isEnabled ).to.true;
 		} );
 
 		it( 'should be false when selection doesn\'t have `linkHref` attribute', () => {
-			model.change( () => {
-				document.selection.removeAttribute( 'linkHref' );
+			model.change( writer => {
+				writer.removeSelectionAttribute( 'linkHref' );
 			} );
 
 			expect( command.isEnabled ).to.false;