enmi-conf.org: comparison wp/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

changeset 16	a86126ab1dd4
parent 9	177826044cd9

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 			removeImage( editor.selection.getNode() );
 		}
 	} );
 	editor.addButton( 'wp_img_edit', {
-		tooltip: 'Edit|button', // '|button' is not displayed, only used for context
+		tooltip: 'Edit|button', // '|button' is not displayed, only used for context.
 		icon: 'dashicon dashicons-edit',
 		onclick: function() {
 			editImage( editor.selection.getNode() );
 		}
 	} );
 			if ( img && img[2] ) {
 				caption = trim( img[2] );
 				img = trim( img[1] );
 			} else {
-				// old captions shortcode style
+				// Old captions shortcode style.
 				caption = trim( b ).replace( /caption=['"]/, '' ).replace( /['"]$/, '' );
 				img = c;
 			}
 			id = ( id && id[1] ) ? id[1].replace( /[<>&]+/g,  '' ) : '';
 				if ( classes ) {
 					classes = ' class="' + classes + '"';
 				}
 				caption = caption.replace( /\r\n|\r/g, '\n' ).replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {
-					// no line breaks inside HTML tags
+					// No line breaks inside HTML tags.
 					return a.replace( /[\r\n\t]+/, ' ' );
 				});
-				// convert remaining line breaks to <br>
+				// Convert remaining line breaks to <br>.
 				caption = caption.replace( /\s*\n\s*/g, '<br />' );
 				return '[caption id="' + id + '" align="' + align + '" width="' + width + '"' + classes + ']' + c + ' ' + caption + '[/caption]';
 			});
 			if ( out.indexOf('[caption') === -1 ) {
-				// the caption html seems broken, try to find the image that may be wrapped in a link
+				// The caption html seems broken, try to find the image that may be wrapped in a link
 				// and may be followed by <p> with the caption text.
 				out = dl.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );
 			}
 			return out;
 		var classes, extraClasses, metadata, captionBlock, caption, link, width, height,
 			captionClassName = [],
 			dom = editor.dom,
 			isIntRegExp = /^\d+$/;
-		// default attributes
+		// Default attributes.
 		metadata = {
 			attachment_id: false,
 			size: 'custom',
 			caption: '',
 			align: 'none',
 		} );
 		metadata.extraClasses = extraClasses.join( ' ' );
-		// Extract caption
+		// Extract caption.
 		captionBlock = dom.getParents( imageNode, '.wp-caption' );
 		if ( captionBlock.length ) {
 			captionBlock = captionBlock[0];
 				metadata.caption = editor.serializer.serialize( caption )
 					.replace( /<br[^>]*>/g, '$&\n' ).replace( /^<p>/, '' ).replace( /<\/p>$/, '' );
 			}
 		}
-		// Extract linkTo
+		// Extract linkTo.
 		if ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' ) {
 			link = imageNode.parentNode;
 			metadata.linkUrl = dom.getAttrib( link, 'href' );
 			metadata.linkTargetBlank = dom.getAttrib( link, 'target' ) === '_blank' ? true : false;
 			metadata.linkRel = dom.getAttrib( link, 'rel' );
 	function hasTextContent( node ) {
 		return node && !! ( node.textContent || node.innerText ).replace( /\ufeff/g, '' );
 	}
-	// Verify HTML in captions
+	// Verify HTML in captions.
 	function verifyHTML( caption ) {
 		if ( ! caption || ( caption.indexOf( '<' ) === -1 && caption.indexOf( '>' ) === -1 ) ) {
 			return caption;
 		}
 			target: imageData.linkTargetBlank ? '_blank': null,
 			'class': imageData.linkClassName || null
 		};
 		if ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' && ! hasTextContent( imageNode.parentNode ) ) {
-			// Update or remove an existing link wrapped around the image
+			// Update or remove an existing link wrapped around the image.
 			if ( imageData.linkUrl ) {
 				dom.setAttribs( imageNode.parentNode, linkAttrs );
 			} else {
 				dom.remove( imageNode.parentNode, true );
 			}
 		} else if ( imageData.linkUrl ) {
 			if ( linkNode = dom.getParent( imageNode, 'a' ) ) {
 				// The image is inside a link together with other nodes,
-				// or is nested in another node, move it out
+				// or is nested in another node, move it out.
 				dom.insertAfter( imageNode, linkNode );
 			}
-			// Add link wrapped around the image
+			// Add link wrapped around the image.
 			linkNode = dom.create( 'a', linkAttrs );
 			imageNode.parentNode.insertBefore( linkNode, imageNode );
 			linkNode.appendChild( imageNode );
 		}
 				}
 			} else {
 				id = id ? 'id="'+ id +'" ' : '';
-				// should create a new function for generating the caption markup
+				// Should create a new function for generating the caption markup.
 				html =  '<dl ' + id + 'class="' + className +'" style="width: '+ width +'px">' +
 					'<dt class="wp-caption-dt"></dt><dd class="wp-caption-dd">'+ imageData.caption +'</dd></dl>';
 				wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
 				if ( parent && dom.isEmpty( parent ) ) {
 					dom.remove( parent );
 				}
 			}
 		} else if ( captionNode ) {
-			// Remove the caption wrapper and place the image in new paragraph
+			// Remove the caption wrapper and place the image in new paragraph.
 			parent = dom.create( 'p' );
 			captionNode.parentNode.insertBefore( parent, captionNode );
 			parent.appendChild( node );
 			dom.remove( captionNode );
 		}
 		metadata = extractImageData( img );
 		// Mark the image node so we can select it later.
 		editor.$( img ).attr( 'data-wp-editing', 1 );
-		// Manipulate the metadata by reference that is fed into the PostImage model used in the media modal
+		// Manipulate the metadata by reference that is fed into the PostImage model used in the media modal.
 		wp.media.events.trigger( 'editor:image-edit', {
 			editor: editor,
 			metadata: metadata,
 			image: img
 		} );
 		frame.state('replace-image').on( 'replace', callback );
 		frame.on( 'close', function() {
 			editor.focus();
 			frame.detach();
-			// `close` fires first...
+			/*
-			// To be able to update the image node, we need to find it here,
+			 * `close` fires first...
-			// and use it in the callback.
+			 * To be able to update the image node, we need to find it here,
+			 * and use it in the callback.
+			 */
 			imageNode = editor.$( 'img[data-wp-editing]' )
 			imageNode.removeAttr( 'data-wp-editing' );
 		});
 		frame.open();
 		var dom = editor.dom,
 			captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions';
 		dom.addClass( editor.getBody(), captionClass );
-		// Prevent IE11 from making dl.wp-caption resizable
+		// Prevent IE11 from making dl.wp-caption resizable.
 		if ( tinymce.Env.ie && tinymce.Env.ie > 10 ) {
-			// The 'mscontrolselect' event is supported only in IE11+
+			// The 'mscontrolselect' event is supported only in IE11+.
 			dom.bind( editor.getBody(), 'mscontrolselect', function( event ) {
 				if ( event.target.nodeName === 'IMG' && dom.getParent( event.target, '.wp-caption' ) ) {
-					// Hide the thick border with resize handles around dl.wp-caption
+					// Hide the thick border with resize handles around dl.wp-caption.
 					editor.getBody().focus(); // :(
 				} else if ( event.target.nodeName === 'DL' && dom.hasClass( event.target, 'wp-caption' ) ) {
 					// Trigger the thick border with resize handles...
 					// This will make the caption text editable.
 					event.target.focus();
 			if ( captionParent ) {
 				if ( cmd === 'mceInsertContent' ) {
 					if ( pasteInCaption ) {
 						pasteInCaption = false;
-						// We are in the caption element, and in 'paste' context,
+						/*
-						// and the pasted HTML was cleaned up on 'pastePostProcess' above.
+						 * We are in the caption element, and in 'paste' context,
-						// Let it be pasted in the caption.
+						 * and the pasted HTML was cleaned up on 'pastePostProcess' above.
+						 * Let it be pasted in the caption.
+						 */
 						return;
 					}
-					// The paste is somewhere else in the caption DL element.
+					/*
-					// Prevent pasting in there as it will break the caption.
+					 * The paste is somewhere else in the caption DL element.
-					// Make new paragraph under the caption DL and move the caret there.
+					 * Prevent pasting in there as it will break the caption.
+					 * Make new paragraph under the caption DL and move the caret there.
+					 */
 					p = dom.create( 'p' );
 					dom.insertAfter( p, captionParent );
 					editor.selection.setCursorLocation( p, 0 );
-					// If the image is selected and the user pastes "over" it,
+					/*
-					// replace both the image and the caption elements with the pasted content.
+					 * If the image is selected and the user pastes "over" it,
-					// This matches the behavior when pasting over non-caption images.
+					 * replace both the image and the caption elements with the pasted content.
+					 * This matches the behavior when pasting over non-caption images.
+					 */
 					if ( node.nodeName === 'IMG' ) {
-editor.$( captionParent ).remove();
+						editor.$( captionParent ).remove();
-}
+					}
 					editor.nodeChanged();
 				} else {
 					// Clicking Indent or Outdent while an image with a caption is selected breaks the caption.
 					// See #38313.
 			keyCode = event.keyCode,
 			dom = editor.dom,
 			VK = tinymce.util.VK;
 		if ( keyCode === VK.ENTER ) {
-			// When pressing Enter inside a caption move the caret to a new parapraph under it
+			// When pressing Enter inside a caption move the caret to a new parapraph under it.
 			node = selection.getNode();
 			wrap = dom.getParent( node, 'div.mceTemp' );
 			if ( wrap ) {
 				dom.events.cancel( event ); // Doesn't cancel all :(
 				return false;
 			}
 		}
 	});
-	// After undo/redo FF seems to set the image height very slowly when it is set to 'auto' in the CSS.
+	/*
-	// This causes image.getBoundingClientRect() to return wrong values and the resize handles are shown in wrong places.
+	 * After undo/redo FF seems to set the image height very slowly when it is set to 'auto' in the CSS.
-	// Collapse the selection to remove the resize handles.
+	 * This causes image.getBoundingClientRect() to return wrong values and the resize handles are shown in wrong places.
+	 * Collapse the selection to remove the resize handles.
+	 */
 	if ( tinymce.Env.gecko ) {
 		editor.on( 'undo redo', function() {
 			if ( editor.selection.getNode().nodeName === 'IMG' ) {
 				editor.selection.collapse();
 			}
 			wrap = null;
 		} );
 	} )();
-	// Add to editor.wp
+	// Add to editor.wp.
 	editor.wp = editor.wp || {};
 	editor.wp.isPlaceholder = isPlaceholder;
 	// Back-compat.
 	return {

enmi-conf.org