瀏覽代碼

Merge branch 'master' into i/6202-remove-env.isEdge

Piotrek Koszuliński 5 年之前
父節點
當前提交
2d8bdc3507
共有 2 個文件被更改,包括 1 次插入92 次删除
  1. 1 67
      packages/ckeditor5-widget/src/widget.js
  2. 0 25
      packages/ckeditor5-widget/tests/widget.js

+ 1 - 67
packages/ckeditor5-widget/src/widget.js

@@ -10,13 +10,11 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import MouseObserver from '@ckeditor/ckeditor5-engine/src/view/observer/mouseobserver';
 import { getLabel, isWidget, WIDGET_SELECTED_CLASS_NAME } from './utils';
-import { getCode, keyCodes, parseKeystroke } from '@ckeditor/ckeditor5-utils/src/keyboard';
+import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import env from '@ckeditor/ckeditor5-utils/src/env';
 
 import '../theme/widget.css';
 
-const selectAllKeystrokeCode = parseKeystroke( 'Ctrl+A' );
-
 /**
  * The widget plugin. It enables base support for widgets.
  *
@@ -172,8 +170,6 @@ export default class Widget extends Plugin {
 		// the propagation.
 		if ( isArrowKeyCode( keyCode ) ) {
 			wasHandled = this._handleArrowKeys( isForward );
-		} else if ( isSelectAllKeyCode( domEventData ) ) {
-			wasHandled = this._selectAllNestedEditableContent() || this._selectAllContent();
 		} else if ( keyCode === keyCodes.enter ) {
 			wasHandled = this._handleEnterKey( domEventData.shiftKey );
 		}
@@ -307,60 +303,6 @@ export default class Widget extends Plugin {
 	}
 
 	/**
-	 * Extends the {@link module:engine/model/selection~Selection document's selection} to span the entire
-	 * content of the nested editable if already anchored in one.
-	 *
-	 * See: {@link module:engine/model/schema~Schema#getLimitElement}.
-	 *
-	 * @private
-	 */
-	_selectAllNestedEditableContent() {
-		const model = this.editor.model;
-		const documentSelection = model.document.selection;
-		const limitElement = model.schema.getLimitElement( documentSelection );
-
-		if ( documentSelection.getFirstRange().root == limitElement ) {
-			return false;
-		}
-
-		model.change( writer => {
-			writer.setSelection( writer.createRangeIn( limitElement ) );
-		} );
-
-		return true;
-	}
-
-	/**
-	 * Handles <kbd>CTRL + A</kbd> when widget is selected.
-	 *
-	 * @private
-	 * @returns {Boolean} Returns true if widget was selected and selecting all was handled by this method.
-	 */
-	_selectAllContent() {
-		const model = this.editor.model;
-		const editing = this.editor.editing;
-		const view = editing.view;
-		const viewDocument = view.document;
-		const viewSelection = viewDocument.selection;
-
-		const selectedElement = viewSelection.getSelectedElement();
-
-		// Only widget is selected.
-		// https://github.com/ckeditor/ckeditor5-widget/issues/23
-		if ( selectedElement && isWidget( selectedElement ) ) {
-			const widgetParent = editing.mapper.toModelElement( selectedElement.parent );
-
-			model.change( writer => {
-				writer.setSelection( writer.createRangeIn( widgetParent ) );
-			} );
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
 	 * Sets {@link module:engine/model/selection~Selection document's selection} over given element.
 	 *
 	 * @private
@@ -425,14 +367,6 @@ function isArrowKeyCode( keyCode ) {
 		keyCode == keyCodes.arrowdown;
 }
 
-// Returns 'true' if provided (DOM) key event data corresponds with the Ctrl+A keystroke.
-//
-// @param {module:engine/view/observer/keyobserver~KeyEventData} domEventData
-// @returns {Boolean}
-function isSelectAllKeyCode( domEventData ) {
-	return getCode( domEventData ) == selectAllKeystrokeCode;
-}
-
 // Returns `true` when element is a nested editable or is placed inside one.
 //
 // @param {module:engine/view/element~Element}

+ 0 - 25
packages/ckeditor5-widget/tests/widget.js

@@ -693,31 +693,6 @@ describe( 'Widget', () => {
 			} );
 		} );
 
-		describe( 'Ctrl+A', () => {
-			test(
-				'should select the entire content of the nested editable',
-				'<widget><nested>foo[]</nested></widget><paragraph>bar</paragraph>',
-				{ keyCode: keyCodes.a, ctrlKey: true },
-				'<widget><nested>[foo]</nested></widget><paragraph>bar</paragraph>'
-			);
-
-			test(
-				'should not change the selection if outside of the nested editable',
-				'<widget><nested>foo</nested></widget><paragraph>[]bar</paragraph>',
-				{ keyCode: keyCodes.a, ctrlKey: true },
-				'<widget><nested>foo</nested></widget><paragraph>[]bar</paragraph>'
-			);
-
-			test(
-				'should selected whole content when widget is selected',
-				'<paragraph>foo</paragraph>[<widget></widget>]<paragraph>bar</paragraph>',
-				{ keyCode: keyCodes.a, ctrlKey: true },
-				'<paragraph>[foo</paragraph><widget></widget><paragraph>bar]</paragraph>',
-				'<p>{foo</p><div class="ck-widget ck-widget_selected" contenteditable="false"><b></b></div><p>bar}</p>'
-
-			);
-		} );
-
 		describe( 'enter', () => {
 			test(
 				'should insert a paragraph after the selected widget upon Enter',