浏览代码

Merge branch 'master' into t/6

Kamil Piechaczek 7 年之前
父节点
当前提交
3b8e042aa1

+ 3 - 3
packages/ckeditor5-media-embed/src/converters.js

@@ -28,7 +28,7 @@ import ViewPosition from '@ckeditor/ckeditor5-engine/src/view/position';
  * **Note:** Changing the model "url" attribute replaces the entire content of the
  * `<figure>` in the view.
  *
- * @param {module:media-embed/mediaregistry~MediaRegistry} mediaRegistry The registry providing
+ * @param {module:media-embed/mediaregistry~MediaRegistry} registry The registry providing
  * the media and their content.
  * @param {Object} options
  * @param {String} [options.semanticDataOutput] When `true`, the converter will create view in the semantic form.
@@ -36,7 +36,7 @@ import ViewPosition from '@ckeditor/ckeditor5-engine/src/view/position';
  * editing pipeline (e.g. including CSS classes, content placeholders).
  * @returns {Function}
  */
-export function modelToViewUrlAttributeConverter( mediaRegistry, options ) {
+export function modelToViewUrlAttributeConverter( registry, options ) {
 	const mediaViewElementOptions = {
 		useSemanticWrapper: options.semanticDataOutput,
 		renderContent: !options.semanticDataOutput,
@@ -59,7 +59,7 @@ export function modelToViewUrlAttributeConverter( mediaRegistry, options ) {
 		// TODO: removing it and creating it from scratch is a hack. We can do better than that.
 		viewWriter.remove( ViewRange.createIn( figure ) );
 
-		const mediaViewElement = mediaRegistry.getMediaViewElement( viewWriter, url, mediaViewElementOptions );
+		const mediaViewElement = registry.getMediaViewElement( viewWriter, url, mediaViewElementOptions );
 
 		viewWriter.insert( ViewPosition.createAt( figure ), mediaViewElement );
 	}

+ 9 - 9
packages/ckeditor5-media-embed/src/mediaembedediting.js

@@ -123,9 +123,9 @@ export default class MediaEmbedEditing extends Plugin {
 		/**
 		 * The media registry managing the media providers in the editor.
 		 *
-		 * @member {module:media-embed/mediaregistry~MediaRegistry} #mediaRegistry
+		 * @member {module:media-embed/mediaregistry~MediaRegistry} #registry
 		 */
-		this.mediaRegistry = new MediaRegistry( editor.locale, editor.config.get( 'mediaEmbed' ) );
+		this.registry = new MediaRegistry( editor.locale, editor.config.get( 'mediaEmbed' ) );
 	}
 
 	/**
@@ -137,7 +137,7 @@ export default class MediaEmbedEditing extends Plugin {
 		const t = editor.t;
 		const conversion = editor.conversion;
 		const semanticDataOutput = editor.config.get( 'mediaEmbed.semanticDataOutput' );
-		const mediaRegistry = this.mediaRegistry;
+		const registry = this.registry;
 
 		editor.commands.add( 'mediaEmbed', new MediaEmbedCommand( editor ) );
 
@@ -155,7 +155,7 @@ export default class MediaEmbedEditing extends Plugin {
 			view: ( modelElement, viewWriter ) => {
 				const url = modelElement.getAttribute( 'url' );
 
-				return createMediaFigureElement( viewWriter, mediaRegistry, url, {
+				return createMediaFigureElement( viewWriter, registry, url, {
 					useSemanticWrapper: semanticDataOutput || !url,
 					renderContent: !semanticDataOutput
 				} );
@@ -164,7 +164,7 @@ export default class MediaEmbedEditing extends Plugin {
 
 		// Model -> Data (url -> data-oembed-url)
 		conversion.for( 'dataDowncast' ).add(
-			modelToViewUrlAttributeConverter( mediaRegistry, {
+			modelToViewUrlAttributeConverter( registry, {
 				semanticDataOutput
 			} ) );
 
@@ -173,7 +173,7 @@ export default class MediaEmbedEditing extends Plugin {
 			model: 'media',
 			view: ( modelElement, viewWriter ) => {
 				const url = modelElement.getAttribute( 'url' );
-				const figure = createMediaFigureElement( viewWriter, mediaRegistry, url, {
+				const figure = createMediaFigureElement( viewWriter, registry, url, {
 					renderForEditingView: true,
 					renderContent: true
 				} );
@@ -184,7 +184,7 @@ export default class MediaEmbedEditing extends Plugin {
 
 		// Model -> View (url -> data-oembed-url)
 		conversion.for( 'editingDowncast' ).add(
-			modelToViewUrlAttributeConverter( mediaRegistry, {
+			modelToViewUrlAttributeConverter( registry, {
 				renderForEditingView: true
 			} ) );
 
@@ -201,7 +201,7 @@ export default class MediaEmbedEditing extends Plugin {
 				model: ( viewMedia, modelWriter ) => {
 					const url = viewMedia.getAttribute( 'url' );
 
-					if ( mediaRegistry.hasMedia( url ) ) {
+					if ( registry.hasMedia( url ) ) {
 						return modelWriter.createElement( 'media', { url } );
 					}
 				}
@@ -217,7 +217,7 @@ export default class MediaEmbedEditing extends Plugin {
 				model: ( viewMedia, modelWriter ) => {
 					const url = viewMedia.getAttribute( 'data-oembed-url' );
 
-					if ( mediaRegistry.hasMedia( url ) ) {
+					if ( registry.hasMedia( url ) ) {
 						return modelWriter.createElement( 'media', { url } );
 					}
 				}

+ 4 - 4
packages/ckeditor5-media-embed/src/mediaembedui.js

@@ -32,11 +32,11 @@ export default class MediaEmbedUI extends Plugin {
 	init() {
 		const editor = this.editor;
 		const command = editor.commands.get( 'mediaEmbed' );
-		const mediaRegistry = editor.plugins.get( MediaEmbedEditing ).mediaRegistry;
+		const registry = editor.plugins.get( MediaEmbedEditing ).registry;
 
 		// Setup `imageUpload` button.
 		editor.ui.componentFactory.add( 'mediaEmbed', locale => {
-			const form = new MediaFormView( getFormValidators( editor.t, mediaRegistry ), locale );
+			const form = new MediaFormView( getFormValidators( editor.t, registry ), locale );
 			const dropdown = createDropdown( locale );
 
 			this._setUpDropdown( dropdown, form, command, editor );
@@ -100,7 +100,7 @@ export default class MediaEmbedUI extends Plugin {
 	}
 }
 
-function getFormValidators( t, mediaRegistry ) {
+function getFormValidators( t, registry ) {
 	return [
 		form => {
 			if ( !form.url.length ) {
@@ -108,7 +108,7 @@ function getFormValidators( t, mediaRegistry ) {
 			}
 		},
 		form => {
-			if ( !mediaRegistry.hasMedia( form.url ) ) {
+			if ( !registry.hasMedia( form.url ) ) {
 				return t( 'This media URL is not supported.' );
 			}
 		}

+ 3 - 3
packages/ckeditor5-media-embed/src/mediaregistry.js

@@ -87,7 +87,7 @@ export class MediaRegistry {
 	 *
 	 * **Note:** If no URL is specified, an empty view element is returned.
 	 *
-	 * @param {module:engine/view/writer~Writer} writer The view writer used to produce a view element.
+	 * @param {module:engine/view/downcastwriter~DowncastWriter} writer The view writer used to produce a view element.
 	 * @param {String} url The url to be translated into a view element.
 	 * @param {Object} options
 	 * @param {String} [options.renderContent]
@@ -176,7 +176,7 @@ class Media {
 	/**
 	 * Returns view element representation of the media.
 	 *
-	 * @param {module:engine/view/writer~Writer} writer The view writer used to produce a view element.
+	 * @param {module:engine/view/downcastwriter~DowncastWriter} writer The view writer used to produce a view element.
 	 * @param {Object} options
 	 * @param {String} [options.renderContent]
 	 * @param {String} [options.useSemanticWrapper]
@@ -216,7 +216,7 @@ class Media {
 	/**
 	 * Returns the HTML string of the media content preview.
 	 *
-	 * @param {module:engine/view/writer~Writer} writer The view writer used to produce a view element.
+	 * @param {module:engine/view/downcastwriter~DowncastWriter} writer The view writer used to produce a view element.
 	 * @param {Object} options
 	 * @param {String} [options.renderForEditingView]
 	 * @returns {String}

+ 5 - 5
packages/ckeditor5-media-embed/src/utils.js

@@ -18,7 +18,7 @@ const mediaSymbol = Symbol( 'isMedia' );
  * * Calls the {@link module:widget/utils~toWidget} function with the proper element's label creator.
  *
  * @param {module:engine/view/element~Element} viewElement
- * @param {module:engine/view/writer~Writer} writer An instance of the view writer.
+ * @param {module:engine/view/downcastwriter~DowncastWriter} writer An instance of the view writer.
  * @param {String} label The element's label.
  * @returns {module:engine/view/element~Element}
  */
@@ -41,8 +41,8 @@ export function toMediaWidget( viewElement, writer, label ) {
  *			<div data-oembed-url="foo">[ non-semantic media preview for "foo" ]</div>
  *		</figure>
  *
- * @param {module:engine/view/writer~Writer} writer
- * @param {module:media-embed/mediaregistry~MediaRegistry} mediaRegistry
+ * @param {module:engine/view/downcastwriter~DowncastWriter} writer
+ * @param {module:media-embed/mediaregistry~MediaRegistry} registry
  * @param {String} url
  * @param {Object} options
  * @param {String} [options.renderContent]
@@ -50,7 +50,7 @@ export function toMediaWidget( viewElement, writer, label ) {
  * @param {String} [options.renderForEditingView]
  * @returns {module:engine/view/containerelement~ContainerElement}
  */
-export function createMediaFigureElement( writer, mediaRegistry, url, options ) {
+export function createMediaFigureElement( writer, registry, url, options ) {
 	const figure = writer.createContainerElement( 'figure', { class: 'media' } );
 
 	// TODO: This is a hack. Without it, the figure in the data pipeline will contain &nbsp; because
@@ -59,7 +59,7 @@ export function createMediaFigureElement( writer, mediaRegistry, url, options )
 	// Note: The hack is a copy&paste from widget utils; it makes the figure act like it's a widget.
 	figure.getFillerOffset = getFillerOffset;
 
-	writer.insert( ViewPosition.createAt( figure ), mediaRegistry.getMediaViewElement( writer, url, options ) );
+	writer.insert( ViewPosition.createAt( figure ), registry.getMediaViewElement( writer, url, options ) );
 
 	return figure;
 }