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

Revert "Added support for WidgetElements to view test utilities."

This reverts commit b770fcc7d65093afb27dc2372946ebd93221f0f0.
Szymon Kupś 9 лет назад
Родитель
Сommit
df1b982d66

+ 23 - 37
packages/ckeditor5-engine/src/dev-utils/view.js

@@ -21,7 +21,6 @@ import Position from '../view/position.js';
 import AttributeElement from '../view/attributeelement.js';
 import ContainerElement from '../view/containerelement.js';
 import EmptyElement from '../view/emptyelement.js';
-import WidgetElement from '../view/widgetelement.js';
 import ViewText from '../view/text.js';
 
 const ELEMENT_RANGE_START_TOKEN = '[';
@@ -32,7 +31,6 @@ const allowedTypes = {
 	'container': ContainerElement,
 	'attribute': AttributeElement,
 	'empty': EmptyElement,
-	'widget': WidgetElement,
 };
 
 /**
@@ -45,11 +43,8 @@ const allowedTypes = {
  * be not included in returned string.
  * @param {Boolean} [options.rootName='main'] Name of the root from which data should be stringified. If not provided
  * default `main` name will be used.
- * @param {Boolean} [options.showType=false] When set to `true` type of elements will be printed:
- * - `<container:p>` instead of `<p>`,
- * - `<attribute:b>` instead of `<b>`,
- * - `<empty:img>` instead of `<img>`,
- * - `<widget:figure>` instead of `<widget>`.
+ * @param {Boolean} [options.showType=false] When set to `true` type of elements will be printed (`<container:p>`
+ * instead of `<p>`, `<attribute:b>` instead of `<b>` and `<empty:img>` instead of `<img>`).
  * @param {Boolean} [options.showPriority=false] When set to `true` AttributeElement's priority will be printed
  * (`<span view-priority="12">`, `<b view-priority="10">`).
  * @returns {String} The stringified data.
@@ -173,16 +168,15 @@ setData._parse = parse;
  *
  * Additional options object can be provided.
  * If `options.showType` is set to `true`, element's types will be
- * presented:
+ * presented for {@link engine.view.AttributeElement AttributeElements}, {@link engine.view.ContainerElement
+ * ContainerElements} and {@link engine.view.EmptyElement EmptyElements}:
  *
  *		const attribute = new AttributeElement( 'b' );
  *		const container = new ContainerElement( 'p' );
  *		const empty = new EmptyElement( 'img' );
- *		const figure = new WidgetElement( 'figure' );
  *		getData( attribute, null, { showType: true } ); // '<attribute:b></attribute:b>'
  *		getData( container, null, { showType: true } ); // '<container:p></container:p>'
  *		getData( empty, null, { showType: true } ); // '<empty:img></empty:img>'
- *		getData( figure, null, { showType: true } ); // '<widget:figure></widget:figure>'
  *
  * If `options.showPriority` is set to `true`, priority will be displayed for all
  * {@link engine.view.AttributeElement AttributeElements}.
@@ -198,11 +192,8 @@ setData._parse = parse;
  * converted to selection containing this range. If Position instance is provided - it will be converted to selection
  * containing one range collapsed at this position.
  * @param {Object} [options] Object with additional options.
- * @param {Boolean} [options.showType=false] When set to `true` type of elements will be printed:
- * - `<container:p>` instead of `<p>`,
- * - `<attribute:b>` instead of `<b>`,
- * - `<empty:img>` instead of `<img>`,
- * - `<widget:figure>` instead of `<widget>`.
+ * @param {Boolean} [options.showType=false] When set to `true` type of elements will be printed (`<container:p>`
+ * instead of `<p>`, `<attribute:b>` instead of `<b>` and `<empty:img>` instead of `<img>`).
  * @param {Boolean} [options.showPriority=false] When set to `true` AttributeElement's priority will be printed
  * (`<span view-priority="12">`, `<b view-priority="10">`).
  * @param {Boolean} [options.ignoreRoot=false] When set to `true` root's element opening and closing will not be printed.
@@ -305,7 +296,7 @@ export function parse( data, options = {} ) {
 		sameSelectionCharacters: options.sameSelectionCharacters
 	} );
 	const processor = new XmlDataProcessor( {
-		namespaces: [ 'attribute', 'container', 'empty', 'widget' ]
+		namespaces: Object.keys( allowedTypes )
 	} );
 
 	// Convert data to view.
@@ -577,11 +568,8 @@ class ViewStringify {
 	 * @param root
 	 * @param {engine.view.Selection} [selection=null] Selection which ranges should be also converted to string.
 	 * @param {Object} [options] Options object.
-	 * @param {Boolean} [options.showType=false] When set to `true` type of elements will be printed:
-	 * - `<container:p>` instead of `<p>`,
-	 * - `<attribute:b>` instead of `<b>`,
-	 * - `<empty:img>` instead of `<img>`,
-	 * - `<widget:figure>` instead of `<widget>`.
+	 * @param {Boolean} [options.showType=false] When set to `true` type of elements will be printed (`<container:p>`
+	 * instead of `<p>`, `<attribute:b>` instead of `<b>` and `<empty:img>` instead of `<img>`).
 	 * @param {Boolean} [options.showPriority=false] When set to `true` AttributeElement's priority will be printed.
 	 * @param {Boolean} [options.ignoreRoot=false] When set to `true` root's element opening and closing tag will not
 	 * be outputted.
@@ -740,7 +728,7 @@ class ViewStringify {
 	/**
 	 * Converts passed {@link engine.view.Element Element} to opening tag.
 	 * Depending on current configuration opening tag can be simple (`<a>`), contain type prefix (`<container:p>`,
-	 * `<attribute:a>`, `<empty:img>` or `<widget:figure>`), contain priority information ( `<attribute:a view-priority="20">` ).
+	 * `<attribute:a>` or `<empty:img>`), contain priority information ( `<attribute:a view-priority="20">` ).
 	 * Element's attributes also will be included (`<a href="http://ckeditor.com" name="foobar">`).
 	 *
 	 * @private
@@ -761,7 +749,7 @@ class ViewStringify {
 	/**
 	 * Converts passed {@link engine.view.Element Element} to closing tag.
 	 * Depending on current configuration closing tag can be simple (`</a>`) or contain type prefix (`</container:p>`,
-	 * `</attribute:a>`, `</empty:img>` `</widget:figure>`).
+	 * `</attribute:a>` or `</empty:img>`).
 	 *
 	 * @private
 	 * @param {engine.view.Element} element
@@ -776,12 +764,10 @@ class ViewStringify {
 
 	/**
 	 * Converts passed {@link engine.view.Element Element's} type to its string representation
-	 * Returns:
-	 * - 'attribute' for {@link engine.view.AttributeElement AttributeElements},
-	 * - 'container' for {@link engine.view.ContainerElement ContainerElements},
-	 * - 'empty' for {@link engine.view.EmptyElement EmptyElements},
-	 * - 'widget' for {@link engine.view.WidgetElement WidgetElements},
-	 * - empty string when current configuration is preventing showing elements' types.
+	 * Returns 'attribute' for {@link engine.view.AttributeElement AttributeElements},
+	 * 'container' for {@link engine.view.ContainerElement ContainerElements} and 'empty' for
+	 * {@link engine.view.EmptyElement EmptyElements}. Returns empty string when current configuration is preventing
+	 * showing elements' types.
 	 *
 	 * @private
 	 * @param {engine.view.Element} element
@@ -868,13 +854,13 @@ function _convertViewElements( rootNode ) {
 }
 
 // Converts {@link engine.view.Element Element} to {@link engine.view.AttributeElement AttributeElement},
-// {@link engine.view.ContainerElement ContainerElement}, {@link engine.view.EmptyElement EmptyElement} or
-// {@link engine.view.WidgetElement WidgetElement}.
+// {@link engine.view.ContainerElement ContainerElement} or {@link engine.view.EmptyElement EmptyElement}.
 // If element's name is in format `attribute:b` with `view-priority="11"` attribute it will be converted to
 // {@link engine.view.AttributeElement AttributeElement} with priority 11.
-// If element's name is in format `container:p` - it will be converted to {@link engine.view.ContainerElement ContainerElement}.
-// If element's name is in format `empty:img` - it will be converted to {@link engine.view.EmptyElement EmptyElement}.
-// If element's name is in format `widget:figure` - it will be converted to {@link engine.view.WidgetElement WidgetElement}.
+// If element's name is in format `container:p` - it will be converted to
+// {@link engine.view.ContainerElement ContainerElement}.
+// If element's name is in format `empty:img` - it will be converted to
+// {@link engine.view.EmptyElement EmptyElement}.
 // If element's name will not contain any additional information - {@link engine.view.Element view Element} will be
 // returned.
 //
@@ -904,12 +890,12 @@ function _convertElement( viewElement ) {
 // {@link engine.view.AttributeElement AttributeElement}, {@link engine.view.ContainerElement ContainerElement} or
 // {@link engine.view.EmptyElement EmptyElement} instance.
 // Name can be provided in two formats: as a simple element's name (`div`), or as a type and name (`container:div`,
-// `attribute:span`, `empty:img`, `widget:figure`);
+// `attribute:span`, `empty:img`);
 //
 // @param {engine.view.Element} element Element which name should be converted.
 // @returns {Object} info Object with parsed information.
 // @returns {String} info.name Parsed name of the element.
-// @returns {String|null} info.type Parsed type of the element, can be `attribute`, `container`, `empty` or `widget`.
+// @returns {String|null} info.type Parsed type of the element, can be `attribute`, `container` or `empty`.
 // returns {Number|null} info.priority Parsed priority of the element.
 function _convertElementNameAndPriority( viewElement ) {
 	const parts = viewElement.name.split( ':' );
@@ -938,7 +924,7 @@ function _convertElementNameAndPriority( viewElement ) {
 	throw new Error( `Parse error - cannot parse element's name: ${ viewElement.name }.` );
 }
 
-// Checks if element's type is allowed. Returns `attribute`, `container`, `empty`, `widget` or `null`.
+// Checks if element's type is allowed. Returns `attribute`, `container`, `empty` or `null`.
 //
 // @param {String} type
 // @returns {String|null}

+ 0 - 39
packages/ckeditor5-engine/tests/dev-utils/view.js

@@ -12,7 +12,6 @@ import Position from 'ckeditor5/engine/view/position.js';
 import Element from 'ckeditor5/engine/view/element.js';
 import AttributeElement from 'ckeditor5/engine/view/attributeelement.js';
 import ContainerElement from 'ckeditor5/engine/view/containerelement.js';
-import WidgetElement from 'ckeditor5/engine/view/widgetelement.js';
 import EmptyElement from 'ckeditor5/engine/view/emptyelement.js';
 import Text from 'ckeditor5/engine/view/text.js';
 import Selection from 'ckeditor5/engine/view/selection.js';
@@ -341,30 +340,6 @@ describe( 'view test utils', () => {
 			expect( stringify( p, null, { showType: true } ) )
 				.to.equal( '<container:p><empty:img></empty:img></container:p>' );
 		} );
-
-		it( 'should stringify single WidgetElement', () => {
-			const figure = new WidgetElement( 'figure' );
-
-			expect( stringify( figure , null, { showType: true } ) )
-				.to.equal( '<widget:figure contenteditable="false"></widget:figure>' );
-		} );
-
-		it( 'should stringify single WidgetElement inside ContainerElement', () => {
-			const figure = new WidgetElement( 'figure' );
-			const container = new ContainerElement( 'p', null, figure );
-
-			expect( stringify( container , null, { showType: true } ) )
-				.to.equal( '<container:p><widget:figure contenteditable="false"></widget:figure></container:p>' );
-		} );
-
-		it( 'should stringify single WidgetElement with children', () => {
-			const text = new Text( 'foo bar' );
-			const b = new AttributeElement( 'b', null, text );
-			const figure = new WidgetElement( 'figure', null, b );
-
-			expect( stringify( figure , null, { showType: true } ) )
-				.to.equal( '<widget:figure contenteditable="false"><attribute:b>foo bar</attribute:b></widget:figure>' );
-		} );
 	} );
 
 	describe( 'parse', () => {
@@ -657,19 +632,5 @@ describe( 'view test utils', () => {
 				parse( '<empty:img>foo bar</empty:img>' );
 			} ).to.throw( Error, 'Parse error - cannot parse inside EmptyElement.' );
 		} );
-
-		it( 'should parse WidgetElement', () => {
-			const data = parse( '<widget:figure></widget:figure>' );
-
-			expect( stringify( data, null, { showType: true } ) )
-				.to.equal( '<widget:figure contenteditable="false"></widget:figure>' );
-		} );
-
-		it( 'should parse WidgetElement with children', () => {
-			const data = parse( '<widget:figure><attribute:b>foo bar</attribute:b></widget:figure>' );
-
-			expect( stringify( data, null, { showType: true } ) )
-				.to.equal( '<widget:figure contenteditable="false"><attribute:b>foo bar</attribute:b></widget:figure>' );
-		} );
 	} );
 } );