Merge branch 'master' into t/139

package.json

@@ -14,7 +14,6 @@
     "@ckeditor/ckeditor5-editor-classic": "^0.7.3",
     "@ckeditor/ckeditor5-enter": "^0.9.1",
     "@ckeditor/ckeditor5-heading": "^0.9.1",
-    "@ckeditor/ckeditor5-image": "^0.6.0",
     "@ckeditor/ckeditor5-paragraph": "^0.8.0",
     "@ckeditor/ckeditor5-typing": "^0.9.1",
     "@ckeditor/ckeditor5-undo": "^0.8.1",

src/linkcommand.js

@@ -33,7 +33,7 @@ export default class LinkCommand extends Command {
 		const doc = this.editor.document;
 
 		this.value = doc.selection.getAttribute( 'linkHref' );
-		this.isEnabled = this._checkEnabled();
+		this.isEnabled = doc.schema.checkAttributeInSelection( doc.selection, 'linkHref' );
 	}
 
 	/**
@@ -94,22 +94,4 @@ export default class LinkCommand extends Command {
 			}
 		} );
 	}
-
-	/**
-	 * Checks whether the command can be enabled in the current context.
-	 *
-	 * @private
-	 * @returns {Boolean} Whether the command should be enabled.
-	 */
-	_checkEnabled() {
-		const doc = this.editor.document;
-		const selectedElement = doc.selection.getSelectedElement();
-
-		// https://github.com/ckeditor/ckeditor5-link/issues/85
-		if ( selectedElement && selectedElement.is( 'image' ) ) {
-			return false;
-		}
-
-		return doc.schema.checkAttributeInSelection( doc.selection, 'linkHref' );
-	}
 }