X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 6725535a..25d33562 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -1,12 +1,123 @@ /* global tinymce */ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { - var toolbarActive = false, - editingImage = false; + var toolbar, serializer, touchOnImage, pasteInCaption, + each = tinymce.each, + trim = tinymce.trim, + iOS = tinymce.Env.iOS; + + function isPlaceholder( node ) { + return !! ( editor.dom.getAttrib( node, 'data-mce-placeholder' ) || editor.dom.getAttrib( node, 'data-mce-object' ) ); + } + + editor.addButton( 'wp_img_remove', { + tooltip: 'Remove', + icon: 'dashicon dashicons-no', + onclick: function() { + removeImage( editor.selection.getNode() ); + } + } ); + + editor.addButton( 'wp_img_edit', { + tooltip: 'Edit ', // trailing space is needed, used for context + icon: 'dashicon dashicons-edit', + onclick: function() { + editImage( editor.selection.getNode() ); + } + } ); + + each( { + alignleft: 'Align left', + aligncenter: 'Align center', + alignright: 'Align right', + alignnone: 'No alignment' + }, function( tooltip, name ) { + var direction = name.slice( 5 ); + + editor.addButton( 'wp_img_' + name, { + tooltip: tooltip, + icon: 'dashicon dashicons-align-' + direction, + cmd: 'alignnone' === name ? 'wpAlignNone' : 'Justify' + direction.slice( 0, 1 ).toUpperCase() + direction.slice( 1 ), + onPostRender: function() { + var self = this; + + editor.on( 'NodeChange', function( event ) { + var node; + + // Don't bother. + if ( event.element.nodeName !== 'IMG' ) { + return; + } + + node = editor.dom.getParent( event.element, '.wp-caption' ) || event.element; + + if ( 'alignnone' === name ) { + self.active( ! /\balign(left|center|right)\b/.test( node.className ) ); + } else { + self.active( editor.dom.hasClass( node, name ) ); + } + } ); + } + } ); + } ); + + editor.once( 'preinit', function() { + if ( editor.wp && editor.wp._createToolbar ) { + toolbar = editor.wp._createToolbar( [ + 'wp_img_alignleft', + 'wp_img_aligncenter', + 'wp_img_alignright', + 'wp_img_alignnone', + 'wp_img_edit', + 'wp_img_remove' + ] ); + } + } ); + + editor.on( 'wptoolbar', function( event ) { + if ( event.element.nodeName === 'IMG' && ! isPlaceholder( event.element ) ) { + event.toolbar = toolbar; + } + } ); + + function isNonEditable( node ) { + var parent = editor.$( node ).parents( '[contenteditable]' ); + return parent && parent.attr( 'contenteditable' ) === 'false'; + } + + // Safari on iOS fails to select images in contentEditoble mode on touch. + // Select them again. + if ( iOS ) { + editor.on( 'init', function() { + editor.on( 'touchstart', function( event ) { + if ( event.target.nodeName === 'IMG' && ! isNonEditable( event.target ) ) { + touchOnImage = true; + } + }); + + editor.dom.bind( editor.getDoc(), 'touchmove', function() { + touchOnImage = false; + }); + + editor.on( 'touchend', function( event ) { + if ( touchOnImage && event.target.nodeName === 'IMG' && ! isNonEditable( event.target ) ) { + var node = event.target; + + touchOnImage = false; + + window.setTimeout( function() { + editor.selection.select( node ); + editor.nodeChanged(); + }, 100 ); + } else if ( toolbar ) { + toolbar.hide(); + } + }); + }); + } function parseShortcode( content ) { return content.replace( /(?:
)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) { - var id, align, classes, caption, img, width, - trim = tinymce.trim; + var id, align, classes, caption, img, width; id = b.match( /id=['"]([^'"]*)['"] ?/ ); if ( id ) { @@ -67,38 +178,35 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } function getShortcode( content ) { - return content.replace( /
' + out[1] + '
'; - } - - return ''; + if ( dl.indexOf('') !== -1 ) { + // Broken caption. The user managed to drag the image out or type in the wrapper div? + // Remove the[\s\S]*<\/p>)?[\s\S]*/gi, '
$1
$2' ); + out = dl.replace( /[\s\S]*?((?:]+>)?]+>(?:<\/a>)?)([\s\S]*<\/p>)?[\s\S]*/gi, '
$1
$2' ); } return out; @@ -226,9 +334,23 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { return node && !! ( node.textContent || node.innerText ); } + // Verify HTML in captions + function verifyHTML( caption ) { + if ( ! caption || ( caption.indexOf( '<' ) === -1 && caption.indexOf( '>' ) === -1 ) ) { + return caption; + } + + if ( ! serializer ) { + serializer = new tinymce.html.Serializer( {}, editor.schema ); + } + + return serializer.serialize( editor.parser.parse( caption, { forced_root_block: false } ) ); + } + function updateImage( imageNode, imageData ) { var classes, className, node, html, parent, wrap, linkNode, captionNode, dd, dl, id, attrs, linkAttrs, width, height, align, + $imageNode, srcset, src, dom = editor.dom; classes = tinymce.explode( imageData.extraClasses, ' ' ); @@ -303,6 +425,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { } if ( imageData.caption ) { + imageData.caption = verifyHTML( imageData.caption ); id = imageData.attachment_id ? 'attachment_' + imageData.attachment_id : null; align = 'align' + ( imageData.align || 'none' ); @@ -339,18 +462,20 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { // should create a new function for generating the caption markup html = '/, '' ).replace( /<\/p>$/, '' );
}
}
});
- dom.bind( editor.getDoc(), 'dragstart', function( event ) {
- var node = editor.selection.getNode();
-
- // Prevent dragging images out of the caption elements
- if ( node.nodeName === 'IMG' && dom.getParent( node, '.wp-caption' ) ) {
- event.preventDefault();
- }
-
- // Remove toolbar to avoid an orphaned toolbar when dragging an image to a new location
- removeToolbar();
- });
-
// Prevent IE11 from making dl.wp-caption resizable
if ( tinymce.Env.ie && tinymce.Env.ie > 10 ) {
// The 'mscontrolselect' event is supported only in IE11+
@@ -823,14 +823,6 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
event.target.focus();
}
});
-
- editor.on( 'click', function( event ) {
- if ( event.target.nodeName === 'IMG' && dom.getAttrib( event.target, 'data-wp-imgselect' ) &&
- dom.getParent( event.target, 'dl.wp-caption' ) ) {
-
- editor.getBody().focus();
- }
- });
}
});
@@ -857,60 +849,107 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
dom.setStyle( parent, 'width', width + 'px' );
}
}
- // refresh toolbar
- addToolbar( node );
});
}
- });
+ });
+
+ editor.on( 'pastePostProcess', function( event ) {
+ // Pasting in a caption node.
+ if ( editor.dom.getParent( editor.selection.getNode(), 'dd.wp-caption-dd' ) ) {
+ // Remove "non-block" elements that should not be in captions.
+ editor.$( 'img, audio, video, object, embed, iframe, script, style', event.node ).remove();
+
+ editor.$( '*', event.node ).each( function( i, node ) {
+ if ( editor.dom.isBlock( node ) ) {
+ // Insert
where the blocks used to be. Makes it look better after pasting in the caption.
+ if ( tinymce.trim( node.textContent || node.innerText ) ) {
+ editor.dom.insertAfter( editor.dom.create( 'br' ), node );
+ editor.dom.remove( node, true );
+ } else {
+ editor.dom.remove( node );
+ }
+ }
+ });
+
+ // Trim
tags.
+ editor.$( 'br', event.node ).each( function( i, node ) {
+ if ( ! node.nextSibling || node.nextSibling.nodeName === 'BR' ||
+ ! node.previousSibling || node.previousSibling.nodeName === 'BR' ) {
+
+ editor.dom.remove( node );
+ }
+ } );
+
+ // Pasted HTML is cleaned up for inserting in the caption.
+ pasteInCaption = true;
+ }
+ });
editor.on( 'BeforeExecCommand', function( event ) {
- var node, p, DL, align,
+ var node, p, DL, align, replacement, captionParent,
cmd = event.command,
dom = editor.dom;
- if ( cmd === 'mceInsertContent' ) {
- // When inserting content, if the caret is inside a caption create new paragraph under
- // and move the caret there
- if ( node = dom.getParent( editor.selection.getNode(), 'div.mceTemp' ) ) {
- p = dom.create( 'p' );
- dom.insertAfter( p, node );
- editor.selection.setCursorLocation( p, 0 );
- editor.nodeChanged();
- }
- } else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) {
+ if ( cmd === 'mceInsertContent' || cmd === 'Indent' || cmd === 'Outdent' ) {
node = editor.selection.getNode();
- align = cmd.substr(7).toLowerCase();
- align = 'align' + align;
- DL = dom.getParent( node, 'dl.wp-caption' );
-
- removeToolbar();
+ captionParent = dom.getParent( node, 'div.mceTemp' );
+
+ 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.
+ // Let it be pasted in the caption.
+ return;
+ }
- if ( DL ) {
- // When inside an image caption, set the align* class on dl.wp-caption
- if ( dom.hasClass( DL, align ) ) {
- dom.removeClass( DL, align );
- dom.addClass( DL, 'alignnone' );
+ // The paste is somewhere else in the caption DL element.
+ // 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 );
+ editor.nodeChanged();
} else {
- DL.className = DL.className.replace( /align[^ ]+/g, '' );
- dom.addClass( DL, align );
+ // Clicking Indent or Outdent while an image with a caption is selected breaks the caption.
+ // See #38313.
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ return false;
}
+ }
+ } else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' || cmd === 'wpAlignNone' ) {
+ node = editor.selection.getNode();
+ align = 'align' + cmd.slice( 7 ).toLowerCase();
+ DL = editor.dom.getParent( node, '.wp-caption' );
- if ( node.nodeName === 'IMG' ) {
- // Re-select the image to update resize handles, etc.
- editor.nodeChanged();
- }
+ if ( node.nodeName !== 'IMG' && ! DL ) {
+ return;
+ }
- event.preventDefault();
+ node = DL || node;
+
+ if ( editor.dom.hasClass( node, align ) ) {
+ replacement = ' alignnone';
+ } else {
+ replacement = ' ' + align;
}
- if ( node.nodeName === 'IMG' ) {
- if ( dom.hasClass( node, align ) ) {
- // The align class is being removed
- dom.addClass( node, 'alignnone' );
- } else {
- dom.removeClass( node, 'alignnone' );
- }
+ node.className = trim( node.className.replace( / ?align(left|center|right|none)/g, '' ) + replacement );
+
+ editor.nodeChanged();
+ event.preventDefault();
+
+ if ( toolbar ) {
+ toolbar.reposition();
}
+
+ editor.fire( 'ExecCommand', {
+ command: cmd,
+ ui: event.ui,
+ value: event.value
+ } );
}
});
@@ -962,34 +1001,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
removeImage( node );
return false;
}
-
- removeToolbar();
}
-
- // Most key presses will replace the image so we need to remove the toolbar
- if ( toolbarActive ) {
- if ( event.ctrlKey || event.metaKey || event.altKey || ( keyCode < 48 && keyCode !== VK.SPACEBAR ) ) {
- return;
- }
-
- removeToolbar();
- }
- });
-
- editor.on( 'mousedown', function( event ) {
- if ( isToolbarButton( event.target ) ) {
- if ( tinymce.Env.ie ) {
- // Stop IE > 8 from making the wrapper resizable on mousedown
- event.preventDefault();
- }
- } else if ( event.target.nodeName !== 'IMG' ) {
- removeToolbar();
- }
- });
-
- // Remove from undo levels
- editor.on( 'BeforeAddUndo', function( event ) {
- event.level.content = event.level.content.replace( / data-wp-imgselect="1"/g, '' );
});
// After undo/redo FF seems to set the image height very slowly when it is set to 'auto' in the CSS.
@@ -1003,10 +1015,6 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
});
}
- editor.on( 'cut wpview-selected', function() {
- removeToolbar();
- });
-
editor.wpSetImgCaption = function( content ) {
return parseShortcode( content );
};
@@ -1015,6 +1023,12 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
return getShortcode( content );
};
+ editor.on( 'beforeGetContent', function( event ) {
+ if ( event.format !== 'raw' ) {
+ editor.$( 'img[id="__wp-temp-img-id"]' ).attr( 'id', null );
+ }
+ });
+
editor.on( 'BeforeSetContent', function( event ) {
if ( event.format !== 'raw' ) {
event.content = editor.wpSetImgCaption( event.content );
@@ -1024,10 +1038,53 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
editor.on( 'PostProcess', function( event ) {
if ( event.get ) {
event.content = editor.wpGetImgCaption( event.content );
- event.content = event.content.replace( / data-wp-imgselect="1"/g, '' );
}
});
+ ( function() {
+ var wrap;
+
+ editor.on( 'dragstart', function() {
+ var node = editor.selection.getNode();
+
+ if ( node.nodeName === 'IMG' ) {
+ wrap = editor.dom.getParent( node, '.mceTemp' );
+
+ if ( ! wrap && node.parentNode.nodeName === 'A' && ! hasTextContent( node.parentNode ) ) {
+ wrap = node.parentNode;
+ }
+ }
+ } );
+
+ editor.on( 'drop', function( event ) {
+ var dom = editor.dom,
+ rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint( event.clientX, event.clientY, editor.getDoc() );
+
+ // Don't allow anything to be dropped in a captioned image.
+ if ( rng && dom.getParent( rng.startContainer, '.mceTemp' ) ) {
+ event.preventDefault();
+ } else if ( wrap ) {
+ event.preventDefault();
+
+ editor.undoManager.transact( function() {
+ if ( rng ) {
+ editor.selection.setRng( rng );
+ }
+
+ editor.selection.setNode( wrap );
+ dom.remove( wrap );
+ } );
+ }
+
+ wrap = null;
+ } );
+ } )();
+
+ // Add to editor.wp
+ editor.wp = editor.wp || {};
+ editor.wp.isPlaceholder = isPlaceholder;
+
+ // Back-compat.
return {
_do_shcode: parseShortcode,
_get_shcode: getShortcode