Ver código fonte

Merge branch 'master' into t/ckeditor5/447

Piotrek Koszuliński 8 anos atrás
pai
commit
0668ee80d2

+ 5 - 6
packages/ckeditor5-link/src/link.js

@@ -53,7 +53,9 @@ export default class Link extends Plugin {
 	 * @inheritDoc
 	 */
 	init() {
-		this.editor.editing.view.addObserver( ClickObserver );
+		const editor = this.editor;
+
+		editor.editing.view.addObserver( ClickObserver );
 
 		/**
 		 * The form view displayed inside the balloon.
@@ -68,7 +70,7 @@ export default class Link extends Plugin {
 		 * @private
 		 * @member {module:ui/panel/balloon/contextualballoon~ContextualBalloon}
 		 */
-		this._balloon = this.editor.plugins.get( ContextualBalloon );
+		this._balloon = editor.plugins.get( ContextualBalloon );
 
 		// Create toolbar buttons.
 		this._createToolbarLinkButton();
@@ -342,10 +344,7 @@ export default class Link extends Plugin {
 			// Otherwise attach panel to the selection.
 			viewDocument.domConverter.viewRangeToDom( viewDocument.selection.getFirstRange() );
 
-		return {
-			target,
-			limiter: viewDocument.domConverter.mapViewToDom( viewDocument.selection.editableElement )
-		};
+		return { target };
 	}
 
 	/**

+ 1 - 1
packages/ckeditor5-link/src/ui/linkformview.js

@@ -199,7 +199,7 @@ export default class LinkFormView extends View {
 		const labeledInput = new LabeledInputView( this.locale, InputTextView );
 
 		labeledInput.label = t( 'Link URL' );
-		labeledInput.inputView.placeholder = t( 'http://example.com' );
+		labeledInput.inputView.placeholder = 'https://example.com';
 
 		return labeledInput;
 	}

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

@@ -91,8 +91,7 @@ describe( 'Link', () => {
 			sinon.assert.calledWithExactly( balloonAddSpy, {
 				view: formView,
 				position: {
-					target: selectedRange,
-					limiter: editorElement
+					target: selectedRange
 				}
 			} );
 		} );
@@ -107,8 +106,7 @@ describe( 'Link', () => {
 			sinon.assert.calledWithExactly( balloonAddSpy, {
 				view: formView,
 				position: {
-					target: selectedRange,
-					limiter: editorElement
+					target: selectedRange
 				}
 			} );
 		} );
@@ -125,8 +123,7 @@ describe( 'Link', () => {
 			sinon.assert.calledWithExactly( balloonAddSpy, {
 				view: formView,
 				position: {
-					target: linkElement,
-					limiter: editorElement
+					target: linkElement
 				}
 			} );
 		} );
@@ -293,8 +290,7 @@ describe( 'Link', () => {
 
 				sinon.assert.calledOnce( spy );
 				sinon.assert.calledWithExactly( spy, {
-					target: editorElement.ownerDocument.getSelection().getRangeAt( 0 ),
-					limiter: editorElement
+					target: editorElement.ownerDocument.getSelection().getRangeAt( 0 )
 				} );
 			} );
 

+ 1 - 1
packages/ckeditor5-link/tests/ui/linkformview.js

@@ -101,7 +101,7 @@ describe( 'LinkFormView', () => {
 
 		describe( 'url input view', () => {
 			it( 'has placeholder', () => {
-				expect( view.urlInputView.inputView.placeholder ).to.equal( 'http://example.com' );
+				expect( view.urlInputView.inputView.placeholder ).to.equal( 'https://example.com' );
 			} );
 		} );