TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
/* global tinymce */
|
|
|
|
|
tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
|
2015-03-11 18:41:26 -04:00
|
|
|
|
var toolbar, serializer,
|
2014-11-12 19:56:22 -05:00
|
|
|
|
each = tinymce.each,
|
2015-05-25 02:35:28 -04:00
|
|
|
|
trim = tinymce.trim,
|
2015-03-11 15:12:28 -04:00
|
|
|
|
iOS = tinymce.Env.iOS;
|
2014-11-12 19:56:22 -05:00
|
|
|
|
|
2014-11-16 18:12:22 -05:00
|
|
|
|
function isPlaceholder( node ) {
|
|
|
|
|
return !! ( editor.dom.getAttrib( node, 'data-mce-placeholder' ) || editor.dom.getAttrib( node, 'data-mce-object' ) );
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-12 19:56:22 -05:00
|
|
|
|
editor.addButton( 'wp_img_remove', {
|
|
|
|
|
tooltip: 'Remove',
|
|
|
|
|
icon: 'dashicon dashicons-no',
|
|
|
|
|
onclick: function() {
|
|
|
|
|
removeImage( editor.selection.getNode() );
|
|
|
|
|
}
|
|
|
|
|
} );
|
|
|
|
|
|
|
|
|
|
editor.addButton( 'wp_img_edit', {
|
2014-12-12 19:47:22 -05:00
|
|
|
|
tooltip: 'Edit ', // trailing space is needed, used for context
|
2014-11-12 19:56:22 -05:00
|
|
|
|
icon: 'dashicon dashicons-edit',
|
|
|
|
|
onclick: function() {
|
|
|
|
|
editImage( editor.selection.getNode() );
|
|
|
|
|
}
|
|
|
|
|
} );
|
|
|
|
|
|
|
|
|
|
each( {
|
|
|
|
|
alignleft: 'Align left',
|
|
|
|
|
aligncenter: 'Align center',
|
|
|
|
|
alignright: 'Align right',
|
2014-11-19 12:27:22 -05:00
|
|
|
|
alignnone: 'No alignment'
|
2014-11-12 19:56:22 -05:00
|
|
|
|
}, 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 ) );
|
|
|
|
|
}
|
|
|
|
|
} );
|
|
|
|
|
}
|
|
|
|
|
} );
|
|
|
|
|
} );
|
|
|
|
|
|
2015-03-11 18:41:26 -04:00
|
|
|
|
editor.once( 'preinit', function() {
|
|
|
|
|
toolbar = editor.wp._createToolbar( [
|
|
|
|
|
'wp_img_alignleft',
|
|
|
|
|
'wp_img_aligncenter',
|
|
|
|
|
'wp_img_alignright',
|
|
|
|
|
'wp_img_alignnone',
|
|
|
|
|
'wp_img_edit',
|
|
|
|
|
'wp_img_remove'
|
|
|
|
|
] );
|
|
|
|
|
} );
|
|
|
|
|
|
2015-03-11 15:12:28 -04:00
|
|
|
|
editor.on( 'wptoolbar', function( event ) {
|
|
|
|
|
if ( event.element.nodeName === 'IMG' && ! isPlaceholder( event.element ) ) {
|
2015-03-11 18:41:26 -04:00
|
|
|
|
event.toolbar = toolbar;
|
2014-11-12 19:56:22 -05:00
|
|
|
|
}
|
2015-03-11 15:12:28 -04:00
|
|
|
|
} );
|
2014-11-12 19:56:22 -05:00
|
|
|
|
|
2015-03-11 15:12:28 -04:00
|
|
|
|
// Safari on iOS fails to select image nodes in contentEditoble mode on touch/click.
|
|
|
|
|
// Select them again.
|
2014-11-12 19:56:22 -05:00
|
|
|
|
if ( iOS ) {
|
|
|
|
|
editor.on( 'click', function( event ) {
|
|
|
|
|
if ( event.target.nodeName === 'IMG' ) {
|
|
|
|
|
var node = event.target;
|
|
|
|
|
|
|
|
|
|
window.setTimeout( function() {
|
|
|
|
|
editor.selection.select( node );
|
2015-03-11 15:12:28 -04:00
|
|
|
|
editor.nodeChanged();
|
2014-11-12 19:56:22 -05:00
|
|
|
|
}, 200 );
|
|
|
|
|
} else {
|
2015-03-11 18:41:26 -04:00
|
|
|
|
toolbar.hide();
|
2014-11-12 19:56:22 -05:00
|
|
|
|
}
|
2015-03-11 15:12:28 -04:00
|
|
|
|
} );
|
2014-12-06 18:53:22 -05:00
|
|
|
|
}
|
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
function parseShortcode( content ) {
|
|
|
|
|
return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
|
2015-05-25 02:35:28 -04:00
|
|
|
|
var id, align, classes, caption, img, width;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
|
|
|
|
id = b.match( /id=['"]([^'"]*)['"] ?/ );
|
|
|
|
|
if ( id ) {
|
|
|
|
|
b = b.replace( id[0], '' );
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
align = b.match( /align=['"]([^'"]*)['"] ?/ );
|
|
|
|
|
if ( align ) {
|
|
|
|
|
b = b.replace( align[0], '' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
classes = b.match( /class=['"]([^'"]*)['"] ?/ );
|
|
|
|
|
if ( classes ) {
|
|
|
|
|
b = b.replace( classes[0], '' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
width = b.match( /width=['"]([0-9]*)['"] ?/ );
|
|
|
|
|
if ( width ) {
|
|
|
|
|
b = b.replace( width[0], '' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
c = trim( c );
|
|
|
|
|
img = c.match( /((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)([\s\S]*)/i );
|
|
|
|
|
|
|
|
|
|
if ( img && img[2] ) {
|
2014-08-05 20:58:16 -04:00
|
|
|
|
caption = trim( img[2] );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
img = trim( img[1] );
|
|
|
|
|
} else {
|
|
|
|
|
// old captions shortcode style
|
2014-08-05 20:58:16 -04:00
|
|
|
|
caption = trim( b ).replace( /caption=['"]/, '' ).replace( /['"]$/, '' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
img = c;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
id = ( id && id[1] ) ? id[1].replace( /[<>&]+/g, '' ) : '';
|
|
|
|
|
align = ( align && align[1] ) ? align[1] : 'alignnone';
|
|
|
|
|
classes = ( classes && classes[1] ) ? ' ' + classes[1].replace( /[<>&]+/g, '' ) : '';
|
2014-03-05 19:13:14 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
if ( ! width && img ) {
|
|
|
|
|
width = img.match( /width=['"]([0-9]*)['"]/ );
|
2014-03-05 19:13:14 -05:00
|
|
|
|
}
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
if ( width && width[1] ) {
|
|
|
|
|
width = width[1];
|
2014-03-05 19:13:14 -05:00
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
if ( ! width || ! caption ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
width = parseInt( width, 10 );
|
Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.
There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.
As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding.
The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.
The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.
props obenland, azaozz.
see #26642. also fixes #9066.
Built from https://develop.svn.wordpress.org/trunk@27668
git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 22:05:14 -04:00
|
|
|
|
if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
|
|
|
|
|
width += 10;
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
return '<div class="mceTemp"><dl id="' + id + '" class="wp-caption ' + align + classes + '" style="width: ' + width + 'px">' +
|
|
|
|
|
'<dt class="wp-caption-dt">'+ img +'</dt><dd class="wp-caption-dd">'+ caption +'</dd></dl></div>';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function getShortcode( content ) {
|
|
|
|
|
return content.replace( /<div (?:id="attachment_|class="mceTemp)[^>]*>([\s\S]+?)<\/div>/g, function( a, b ) {
|
2013-12-30 22:10:11 -05:00
|
|
|
|
var out = '';
|
|
|
|
|
|
2013-12-29 20:54:11 -05:00
|
|
|
|
if ( b.indexOf('<img ') === -1 ) {
|
2013-12-30 22:10:11 -05:00
|
|
|
|
// Broken caption. The user managed to drag the image out?
|
|
|
|
|
// Try to return the caption text as a paragraph.
|
|
|
|
|
out = b.match( /<dd [^>]+>([\s\S]+?)<\/dd>/i );
|
|
|
|
|
|
|
|
|
|
if ( out && out[1] ) {
|
2014-01-03 20:28:13 -05:00
|
|
|
|
return '<p>' + out[1] + '</p>';
|
2013-12-30 22:10:11 -05:00
|
|
|
|
}
|
|
|
|
|
|
2013-12-29 20:54:11 -05:00
|
|
|
|
return '';
|
|
|
|
|
}
|
|
|
|
|
|
2014-09-10 19:03:18 -04:00
|
|
|
|
out = b.replace( /\s*<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>\s*/gi, function( a, b, c, caption ) {
|
2014-08-05 20:58:16 -04:00
|
|
|
|
var id, classes, align, width;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
width = c.match( /width="([0-9]*)"/ );
|
|
|
|
|
width = ( width && width[1] ) ? width[1] : '';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2015-04-01 12:04:27 -04:00
|
|
|
|
classes = b.match( /class="([^"]*)"/ );
|
|
|
|
|
classes = ( classes && classes[1] ) ? classes[1] : '';
|
|
|
|
|
align = classes.match( /align[a-z]+/i ) || 'alignnone';
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
if ( ! width || ! caption ) {
|
2015-04-01 12:04:27 -04:00
|
|
|
|
if ( 'alignnone' !== align[0] ) {
|
|
|
|
|
c = c.replace( /><img/, ' class="' + align[0] + '"><img' );
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
return c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
id = b.match( /id="([^"]*)"/ );
|
|
|
|
|
id = ( id && id[1] ) ? id[1] : '';
|
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
classes = classes.replace( /wp-caption ?|align[a-z]+ ?/gi, '' );
|
|
|
|
|
|
|
|
|
|
if ( classes ) {
|
|
|
|
|
classes = ' class="' + classes + '"';
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
caption = caption.replace( /\r\n|\r/g, '\n' ).replace( /<[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
// no line breaks inside HTML tags
|
|
|
|
|
return a.replace( /[\r\n\t]+/, ' ' );
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// convert remaining line breaks to <br>
|
2014-08-05 20:58:16 -04:00
|
|
|
|
caption = caption.replace( /\s*\n\s*/g, '<br />' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
return '[caption id="' + id + '" align="' + align + '" width="' + width + '"' + classes + ']' + c + ' ' + caption + '[/caption]';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
|
2014-09-10 19:03:18 -04:00
|
|
|
|
if ( out.indexOf('[caption') === -1 ) {
|
2014-03-27 14:07:14 -04:00
|
|
|
|
// the caption html seems broken, try to find the image that may be wrapped in a link
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
// and may be followed by <p> with the caption text.
|
2013-12-30 22:10:11 -05:00
|
|
|
|
out = b.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
|
2013-12-30 22:10:11 -05:00
|
|
|
|
return out;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-28 16:17:12 -05:00
|
|
|
|
function extractImageData( imageNode ) {
|
2014-04-01 21:54:15 -04:00
|
|
|
|
var classes, extraClasses, metadata, captionBlock, caption, link, width, height,
|
2014-08-05 20:58:16 -04:00
|
|
|
|
captionClassName = [],
|
2014-04-03 21:49:15 -04:00
|
|
|
|
dom = editor.dom,
|
|
|
|
|
isIntRegExp = /^\d+$/;
|
2014-01-28 16:17:12 -05:00
|
|
|
|
|
|
|
|
|
// default attributes
|
|
|
|
|
metadata = {
|
|
|
|
|
attachment_id: false,
|
2014-04-02 23:21:15 -04:00
|
|
|
|
size: 'custom',
|
2014-01-28 16:17:12 -05:00
|
|
|
|
caption: '',
|
|
|
|
|
align: 'none',
|
2014-04-01 21:54:15 -04:00
|
|
|
|
extraClasses: '',
|
2014-01-28 16:17:12 -05:00
|
|
|
|
link: false,
|
2014-03-27 18:41:14 -04:00
|
|
|
|
linkUrl: '',
|
|
|
|
|
linkClassName: '',
|
|
|
|
|
linkTargetBlank: false,
|
|
|
|
|
linkRel: '',
|
2014-04-01 21:54:15 -04:00
|
|
|
|
title: ''
|
2014-01-28 16:17:12 -05:00
|
|
|
|
};
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
metadata.url = dom.getAttrib( imageNode, 'src' );
|
|
|
|
|
metadata.alt = dom.getAttrib( imageNode, 'alt' );
|
2014-03-27 18:41:14 -04:00
|
|
|
|
metadata.title = dom.getAttrib( imageNode, 'title' );
|
2014-04-03 21:49:15 -04:00
|
|
|
|
|
|
|
|
|
width = dom.getAttrib( imageNode, 'width' );
|
|
|
|
|
height = dom.getAttrib( imageNode, 'height' );
|
|
|
|
|
|
|
|
|
|
if ( ! isIntRegExp.test( width ) || parseInt( width, 10 ) < 1 ) {
|
|
|
|
|
width = imageNode.naturalWidth || imageNode.width;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( ! isIntRegExp.test( height ) || parseInt( height, 10 ) < 1 ) {
|
|
|
|
|
height = imageNode.naturalHeight || imageNode.height;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
metadata.customWidth = metadata.width = width;
|
|
|
|
|
metadata.customHeight = metadata.height = height;
|
2014-04-01 21:54:15 -04:00
|
|
|
|
|
|
|
|
|
classes = tinymce.explode( imageNode.className, ' ' );
|
|
|
|
|
extraClasses = [];
|
|
|
|
|
|
2014-01-28 16:17:12 -05:00
|
|
|
|
tinymce.each( classes, function( name ) {
|
|
|
|
|
|
|
|
|
|
if ( /^wp-image/.test( name ) ) {
|
|
|
|
|
metadata.attachment_id = parseInt( name.replace( 'wp-image-', '' ), 10 );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
} else if ( /^align/.test( name ) ) {
|
2014-01-28 16:17:12 -05:00
|
|
|
|
metadata.align = name.replace( 'align', '' );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
} else if ( /^size/.test( name ) ) {
|
2014-01-28 16:17:12 -05:00
|
|
|
|
metadata.size = name.replace( 'size-', '' );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
} else {
|
|
|
|
|
extraClasses.push( name );
|
2014-01-28 16:17:12 -05:00
|
|
|
|
}
|
2014-04-01 21:54:15 -04:00
|
|
|
|
|
2014-01-28 16:17:12 -05:00
|
|
|
|
} );
|
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
metadata.extraClasses = extraClasses.join( ' ' );
|
|
|
|
|
|
2014-03-27 18:41:14 -04:00
|
|
|
|
// Extract caption
|
2014-02-10 18:48:12 -05:00
|
|
|
|
captionBlock = dom.getParents( imageNode, '.wp-caption' );
|
2014-01-28 16:17:12 -05:00
|
|
|
|
|
|
|
|
|
if ( captionBlock.length ) {
|
|
|
|
|
captionBlock = captionBlock[0];
|
|
|
|
|
|
|
|
|
|
classes = captionBlock.className.split( ' ' );
|
|
|
|
|
tinymce.each( classes, function( name ) {
|
|
|
|
|
if ( /^align/.test( name ) ) {
|
|
|
|
|
metadata.align = name.replace( 'align', '' );
|
2014-08-05 20:58:16 -04:00
|
|
|
|
} else if ( name && name !== 'wp-caption' ) {
|
|
|
|
|
captionClassName.push( name );
|
2014-01-28 16:17:12 -05:00
|
|
|
|
}
|
|
|
|
|
} );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
2014-08-05 20:58:16 -04:00
|
|
|
|
metadata.captionClassName = captionClassName.join( ' ' );
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
caption = dom.select( 'dd.wp-caption-dd', captionBlock );
|
2014-01-28 16:17:12 -05:00
|
|
|
|
if ( caption.length ) {
|
|
|
|
|
caption = caption[0];
|
2014-03-27 18:41:14 -04:00
|
|
|
|
|
2014-01-28 16:17:12 -05:00
|
|
|
|
metadata.caption = editor.serializer.serialize( caption )
|
|
|
|
|
.replace( /<br[^>]*>/g, '$&\n' ).replace( /^<p>/, '' ).replace( /<\/p>$/, '' );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-27 18:41:14 -04:00
|
|
|
|
// Extract linkTo
|
2014-02-10 18:48:12 -05:00
|
|
|
|
if ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' ) {
|
2014-03-27 18:41:14 -04:00
|
|
|
|
link = imageNode.parentNode;
|
|
|
|
|
metadata.linkUrl = dom.getAttrib( link, 'href' );
|
|
|
|
|
metadata.linkTargetBlank = dom.getAttrib( link, 'target' ) === '_blank' ? true : false;
|
|
|
|
|
metadata.linkRel = dom.getAttrib( link, 'rel' );
|
|
|
|
|
metadata.linkClassName = link.className;
|
2014-01-28 16:17:12 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return metadata;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-02 23:21:15 -04:00
|
|
|
|
function hasTextContent( node ) {
|
|
|
|
|
return node && !! ( node.textContent || node.innerText );
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-20 08:49:22 -05:00
|
|
|
|
// 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 } ) );
|
|
|
|
|
}
|
|
|
|
|
|
2014-01-28 16:17:12 -05:00
|
|
|
|
function updateImage( imageNode, imageData ) {
|
2014-04-02 23:21:15 -04:00
|
|
|
|
var classes, className, node, html, parent, wrap, linkNode,
|
2014-08-05 20:58:16 -04:00
|
|
|
|
captionNode, dd, dl, id, attrs, linkAttrs, width, height, align,
|
2014-04-01 21:54:15 -04:00
|
|
|
|
dom = editor.dom;
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
classes = tinymce.explode( imageData.extraClasses, ' ' );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
if ( ! classes ) {
|
|
|
|
|
classes = [];
|
2014-02-10 18:48:12 -05:00
|
|
|
|
}
|
2014-01-28 16:17:12 -05:00
|
|
|
|
|
|
|
|
|
if ( ! imageData.caption ) {
|
|
|
|
|
classes.push( 'align' + imageData.align );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( imageData.attachment_id ) {
|
|
|
|
|
classes.push( 'wp-image-' + imageData.attachment_id );
|
2014-04-02 23:21:15 -04:00
|
|
|
|
if ( imageData.size && imageData.size !== 'custom' ) {
|
2014-01-28 16:17:12 -05:00
|
|
|
|
classes.push( 'size-' + imageData.size );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-02 23:21:15 -04:00
|
|
|
|
width = imageData.width;
|
|
|
|
|
height = imageData.height;
|
|
|
|
|
|
|
|
|
|
if ( imageData.size === 'custom' ) {
|
|
|
|
|
width = imageData.customWidth;
|
|
|
|
|
height = imageData.customHeight;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-27 18:41:14 -04:00
|
|
|
|
attrs = {
|
2014-01-28 16:17:12 -05:00
|
|
|
|
src: imageData.url,
|
2014-04-02 23:21:15 -04:00
|
|
|
|
width: width || null,
|
|
|
|
|
height: height || null,
|
2014-03-27 18:41:14 -04:00
|
|
|
|
alt: imageData.alt,
|
2014-04-01 21:54:15 -04:00
|
|
|
|
title: imageData.title || null,
|
|
|
|
|
'class': classes.join( ' ' ) || null
|
2014-01-28 16:17:12 -05:00
|
|
|
|
};
|
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
dom.setAttribs( imageNode, attrs );
|
|
|
|
|
|
|
|
|
|
linkAttrs = {
|
|
|
|
|
href: imageData.linkUrl,
|
|
|
|
|
rel: imageData.linkRel || null,
|
|
|
|
|
target: imageData.linkTargetBlank ? '_blank': null,
|
|
|
|
|
'class': imageData.linkClassName || null
|
|
|
|
|
};
|
|
|
|
|
|
2014-04-02 23:21:15 -04:00
|
|
|
|
if ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' && ! hasTextContent( imageNode.parentNode ) ) {
|
|
|
|
|
// Update or remove an existing link wrapped around the image
|
2014-04-01 21:54:15 -04:00
|
|
|
|
if ( imageData.linkUrl ) {
|
|
|
|
|
dom.setAttribs( imageNode.parentNode, linkAttrs );
|
|
|
|
|
} else {
|
|
|
|
|
dom.remove( imageNode.parentNode, true );
|
|
|
|
|
}
|
|
|
|
|
} else if ( imageData.linkUrl ) {
|
2014-04-02 23:21:15 -04:00
|
|
|
|
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
|
|
|
|
|
dom.insertAfter( imageNode, linkNode );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Add link wrapped around the image
|
|
|
|
|
linkNode = dom.create( 'a', linkAttrs );
|
|
|
|
|
imageNode.parentNode.insertBefore( linkNode, imageNode );
|
|
|
|
|
linkNode.appendChild( imageNode );
|
2014-01-28 16:17:12 -05:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
captionNode = editor.dom.getParent( imageNode, '.mceTemp' );
|
|
|
|
|
|
2014-04-02 23:21:15 -04:00
|
|
|
|
if ( imageNode.parentNode && imageNode.parentNode.nodeName === 'A' && ! hasTextContent( imageNode.parentNode ) ) {
|
2014-04-01 21:54:15 -04:00
|
|
|
|
node = imageNode.parentNode;
|
|
|
|
|
} else {
|
|
|
|
|
node = imageNode;
|
|
|
|
|
}
|
2014-03-27 18:41:14 -04:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
if ( imageData.caption ) {
|
2014-11-20 08:49:22 -05:00
|
|
|
|
imageData.caption = verifyHTML( imageData.caption );
|
2014-04-02 23:21:15 -04:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
id = imageData.attachment_id ? 'attachment_' + imageData.attachment_id : null;
|
2014-08-05 20:58:16 -04:00
|
|
|
|
align = 'align' + ( imageData.align || 'none' );
|
|
|
|
|
className = 'wp-caption ' + align;
|
|
|
|
|
|
|
|
|
|
if ( imageData.captionClassName ) {
|
|
|
|
|
className += ' ' + imageData.captionClassName.replace( /[<>&]+/g, '' );
|
|
|
|
|
}
|
2014-03-27 18:41:14 -04:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
|
2014-04-02 23:21:15 -04:00
|
|
|
|
width = parseInt( width, 10 );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
width += 10;
|
2014-03-27 18:41:14 -04:00
|
|
|
|
}
|
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
if ( captionNode ) {
|
|
|
|
|
dl = dom.select( 'dl.wp-caption', captionNode );
|
2014-03-27 18:41:14 -04:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
if ( dl.length ) {
|
|
|
|
|
dom.setAttribs( dl, {
|
|
|
|
|
id: id,
|
|
|
|
|
'class': className,
|
|
|
|
|
style: 'width: ' + width + 'px'
|
|
|
|
|
} );
|
|
|
|
|
}
|
2014-03-27 18:41:14 -04:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
dd = dom.select( '.wp-caption-dd', captionNode );
|
|
|
|
|
|
|
|
|
|
if ( dd.length ) {
|
|
|
|
|
dom.setHTML( dd[0], imageData.caption );
|
|
|
|
|
}
|
2014-03-27 18:41:14 -04:00
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
} else {
|
|
|
|
|
id = id ? 'id="'+ id +'" ' : '';
|
|
|
|
|
|
|
|
|
|
// should create a new function for generating the caption markup
|
|
|
|
|
html = '<dl ' + id + 'class="' + className +'" style="width: '+ width +'px">' +
|
2014-10-22 22:08:20 -04:00
|
|
|
|
'<dt class="wp-caption-dt"></dt><dd class="wp-caption-dd">'+ imageData.caption +'</dd></dl>';
|
|
|
|
|
|
|
|
|
|
wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
|
|
|
|
|
if ( parent = dom.getParent( node, 'p' ) ) {
|
2014-04-23 16:42:14 -04:00
|
|
|
|
parent.parentNode.insertBefore( wrap, parent );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
} else {
|
2014-10-22 22:08:20 -04:00
|
|
|
|
node.parentNode.insertBefore( wrap, node );
|
2014-04-01 21:54:15 -04:00
|
|
|
|
}
|
2014-10-22 22:08:20 -04:00
|
|
|
|
|
|
|
|
|
editor.$( wrap ).find( 'dt.wp-caption-dt' ).append( node );
|
2015-04-18 17:56:27 -04:00
|
|
|
|
|
|
|
|
|
if ( parent && dom.isEmpty( parent ) ) {
|
|
|
|
|
dom.remove( parent );
|
|
|
|
|
}
|
2014-04-01 21:54:15 -04:00
|
|
|
|
}
|
|
|
|
|
} else if ( captionNode ) {
|
|
|
|
|
// 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 );
|
2014-01-28 16:17:12 -05:00
|
|
|
|
}
|
2014-04-01 21:54:15 -04:00
|
|
|
|
|
2014-04-13 00:02:15 -04:00
|
|
|
|
if ( wp.media.events ) {
|
|
|
|
|
wp.media.events.trigger( 'editor:image-update', {
|
|
|
|
|
editor: editor,
|
|
|
|
|
metadata: imageData,
|
|
|
|
|
image: imageNode
|
|
|
|
|
} );
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-01 21:54:15 -04:00
|
|
|
|
editor.nodeChanged();
|
2014-01-28 16:17:12 -05:00
|
|
|
|
}
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
function editImage( img ) {
|
2014-04-13 00:02:15 -04:00
|
|
|
|
var frame, callback, metadata;
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
|
|
|
|
if ( typeof wp === 'undefined' || ! wp.media ) {
|
|
|
|
|
editor.execCommand( 'mceImage' );
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-13 00:02:15 -04:00
|
|
|
|
metadata = extractImageData( img );
|
|
|
|
|
|
|
|
|
|
// 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
|
|
|
|
|
} );
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
frame = wp.media({
|
|
|
|
|
frame: 'image',
|
|
|
|
|
state: 'image-details',
|
2014-04-13 00:02:15 -04:00
|
|
|
|
metadata: metadata
|
2014-02-10 18:48:12 -05:00
|
|
|
|
} );
|
|
|
|
|
|
2014-04-13 00:02:15 -04:00
|
|
|
|
wp.media.events.trigger( 'editor:frame-create', { frame: frame } );
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
callback = function( imageData ) {
|
|
|
|
|
editor.focus();
|
2014-04-02 23:21:15 -04:00
|
|
|
|
editor.undoManager.transact( function() {
|
|
|
|
|
updateImage( img, imageData );
|
|
|
|
|
} );
|
2014-02-25 16:03:15 -05:00
|
|
|
|
frame.detach();
|
2014-02-10 18:48:12 -05:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
frame.state('image-details').on( 'update', callback );
|
|
|
|
|
frame.state('replace-image').on( 'replace', callback );
|
|
|
|
|
frame.on( 'close', function() {
|
|
|
|
|
editor.focus();
|
2014-02-25 16:03:15 -05:00
|
|
|
|
frame.detach();
|
2014-02-10 18:48:12 -05:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
frame.open();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function removeImage( node ) {
|
2015-07-08 20:25:25 -04:00
|
|
|
|
var wrap = editor.dom.getParent( node, 'div.mceTemp' );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
2015-07-08 20:25:25 -04:00
|
|
|
|
if ( ! wrap && node.nodeName === 'IMG' ) {
|
|
|
|
|
wrap = editor.dom.getParent( node, 'a' );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( wrap ) {
|
|
|
|
|
if ( wrap.nextSibling ) {
|
|
|
|
|
editor.selection.select( wrap.nextSibling );
|
|
|
|
|
} else if ( wrap.previousSibling ) {
|
|
|
|
|
editor.selection.select( wrap.previousSibling );
|
|
|
|
|
} else {
|
|
|
|
|
editor.selection.select( wrap.parentNode );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
editor.selection.collapse( true );
|
|
|
|
|
editor.dom.remove( wrap );
|
|
|
|
|
} else {
|
|
|
|
|
editor.dom.remove( node );
|
|
|
|
|
}
|
2014-08-10 00:22:15 -04:00
|
|
|
|
|
|
|
|
|
editor.nodeChanged();
|
|
|
|
|
editor.undoManager.add();
|
2014-02-10 18:48:12 -05:00
|
|
|
|
}
|
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
editor.on( 'init', function() {
|
2014-03-26 19:13:15 -04:00
|
|
|
|
var dom = editor.dom,
|
|
|
|
|
captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-03-26 19:13:15 -04:00
|
|
|
|
dom.addClass( editor.getBody(), captionClass );
|
Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.
There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.
As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding.
The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.
The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.
props obenland, azaozz.
see #26642. also fixes #9066.
Built from https://develop.svn.wordpress.org/trunk@27668
git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 22:05:14 -04:00
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
// Add caption field to the default image dialog
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'wpLoadImageForm', function( event ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
if ( editor.getParam( 'wpeditimage_disable_captions' ) ) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var captionField = {
|
|
|
|
|
type: 'textbox',
|
|
|
|
|
flex: 1,
|
|
|
|
|
name: 'caption',
|
|
|
|
|
minHeight: 60,
|
|
|
|
|
multiline: true,
|
|
|
|
|
scroll: true,
|
|
|
|
|
label: 'Image caption'
|
|
|
|
|
};
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
event.data.splice( event.data.length - 1, 0, captionField );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Fix caption parent width for images added from URL
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'wpNewImageRefresh', function( event ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
var parent, captionWidth;
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
if ( parent = dom.getParent( event.node, 'dl.wp-caption' ) ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
if ( ! parent.style.width ) {
|
2014-02-10 18:48:12 -05:00
|
|
|
|
captionWidth = parseInt( event.node.clientWidth, 10 ) + 10;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
captionWidth = captionWidth ? captionWidth + 'px' : '50%';
|
|
|
|
|
dom.setStyle( parent, 'width', captionWidth );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'wpImageFormSubmit', function( event ) {
|
|
|
|
|
var data = event.imgData.data,
|
|
|
|
|
imgNode = event.imgData.node,
|
|
|
|
|
caption = event.imgData.caption,
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
captionId = '',
|
|
|
|
|
captionAlign = '',
|
|
|
|
|
captionWidth = '',
|
2013-12-29 20:54:11 -05:00
|
|
|
|
wrap, parent, node, html, imgId;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
|
|
|
|
// Temp image id so we can find the node later
|
|
|
|
|
data.id = '__wp-temp-img-id';
|
|
|
|
|
// Cancel the original callback
|
2014-02-10 18:48:12 -05:00
|
|
|
|
event.imgData.cancel = true;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
|
|
|
|
if ( ! data.style ) {
|
|
|
|
|
data.style = null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( ! data.src ) {
|
|
|
|
|
// Delete the image and the caption
|
|
|
|
|
if ( imgNode ) {
|
|
|
|
|
if ( wrap = dom.getParent( imgNode, 'div.mceTemp' ) ) {
|
|
|
|
|
dom.remove( wrap );
|
|
|
|
|
} else if ( imgNode.parentNode.nodeName === 'A' ) {
|
|
|
|
|
dom.remove( imgNode.parentNode );
|
|
|
|
|
} else {
|
|
|
|
|
dom.remove( imgNode );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
editor.nodeChanged();
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2013-12-30 22:10:11 -05:00
|
|
|
|
if ( caption ) {
|
|
|
|
|
caption = caption.replace( /\r\n|\r/g, '\n' ).replace( /<\/?[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {
|
|
|
|
|
// No line breaks inside HTML tags
|
|
|
|
|
return a.replace( /[\r\n\t]+/, ' ' );
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Convert remaining line breaks to <br>
|
|
|
|
|
caption = caption.replace( /(<br[^>]*>)\s*\n\s*/g, '$1' ).replace( /\s*\n\s*/g, '<br />' );
|
2014-11-20 08:49:22 -05:00
|
|
|
|
caption = verifyHTML( caption );
|
2013-12-30 22:10:11 -05:00
|
|
|
|
}
|
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
if ( ! imgNode ) {
|
|
|
|
|
// New image inserted
|
|
|
|
|
html = dom.createHTML( 'img', data );
|
|
|
|
|
|
|
|
|
|
if ( caption ) {
|
|
|
|
|
node = editor.selection.getNode();
|
|
|
|
|
|
|
|
|
|
if ( data.width ) {
|
Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.
There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.
As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding.
The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.
The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.
props obenland, azaozz.
see #26642. also fixes #9066.
Built from https://develop.svn.wordpress.org/trunk@27668
git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 22:05:14 -04:00
|
|
|
|
captionWidth = parseInt( data.width, 10 );
|
|
|
|
|
|
|
|
|
|
if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
|
|
|
|
|
captionWidth += 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
captionWidth = ' style="width: ' + captionWidth + 'px"';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
html = '<dl class="wp-caption alignnone"' + captionWidth + '>' +
|
|
|
|
|
'<dt class="wp-caption-dt">'+ html +'</dt><dd class="wp-caption-dd">'+ caption +'</dd></dl>';
|
|
|
|
|
|
|
|
|
|
if ( node.nodeName === 'P' ) {
|
|
|
|
|
parent = node;
|
|
|
|
|
} else {
|
|
|
|
|
parent = dom.getParent( node, 'p' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( parent && parent.nodeName === 'P' ) {
|
2014-02-10 18:48:12 -05:00
|
|
|
|
wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
|
2014-04-23 16:42:14 -04:00
|
|
|
|
parent.parentNode.insertBefore( wrap, parent );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
editor.selection.select( wrap );
|
|
|
|
|
editor.nodeChanged();
|
|
|
|
|
|
|
|
|
|
if ( dom.isEmpty( parent ) ) {
|
|
|
|
|
dom.remove( parent );
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.selection.setContent( '<div class="mceTemp">' + html + '</div>' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
editor.selection.setContent( html );
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// Edit existing image
|
|
|
|
|
|
|
|
|
|
// Store the original image id if any
|
|
|
|
|
imgId = imgNode.id || null;
|
|
|
|
|
// Update the image node
|
|
|
|
|
dom.setAttribs( imgNode, data );
|
|
|
|
|
wrap = dom.getParent( imgNode, 'dl.wp-caption' );
|
|
|
|
|
|
|
|
|
|
if ( caption ) {
|
|
|
|
|
if ( wrap ) {
|
|
|
|
|
if ( parent = dom.select( 'dd.wp-caption-dd', wrap )[0] ) {
|
|
|
|
|
parent.innerHTML = caption;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if ( imgNode.className ) {
|
|
|
|
|
captionId = imgNode.className.match( /wp-image-([0-9]+)/ );
|
|
|
|
|
captionAlign = imgNode.className.match( /align(left|right|center|none)/ );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( captionAlign ) {
|
|
|
|
|
captionAlign = captionAlign[0];
|
|
|
|
|
imgNode.className = imgNode.className.replace( /align(left|right|center|none)/g, '' );
|
|
|
|
|
} else {
|
|
|
|
|
captionAlign = 'alignnone';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
captionAlign = ' class="wp-caption ' + captionAlign + '"';
|
|
|
|
|
|
|
|
|
|
if ( captionId ) {
|
|
|
|
|
captionId = ' id="attachment_' + captionId[1] + '"';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
captionWidth = data.width || imgNode.clientWidth;
|
|
|
|
|
|
|
|
|
|
if ( captionWidth ) {
|
Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.
There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.
As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding.
The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.
The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.
props obenland, azaozz.
see #26642. also fixes #9066.
Built from https://develop.svn.wordpress.org/trunk@27668
git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 22:05:14 -04:00
|
|
|
|
captionWidth = parseInt( captionWidth, 10 );
|
|
|
|
|
|
|
|
|
|
if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
|
|
|
|
|
captionWidth += 10;
|
|
|
|
|
}
|
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
captionWidth = ' style="width: '+ captionWidth +'px"';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( imgNode.parentNode && imgNode.parentNode.nodeName === 'A' ) {
|
|
|
|
|
node = imgNode.parentNode;
|
|
|
|
|
} else {
|
|
|
|
|
node = imgNode;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
html = '<dl ' + captionId + captionAlign + captionWidth + '>' +
|
2014-10-22 22:08:20 -04:00
|
|
|
|
'<dt class="wp-caption-dt"></dt><dd class="wp-caption-dd">'+ caption +'</dd></dl>';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-10-22 22:08:20 -04:00
|
|
|
|
wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-10-22 22:08:20 -04:00
|
|
|
|
if ( parent = dom.getParent( node, 'p' ) ) {
|
|
|
|
|
parent.parentNode.insertBefore( wrap, parent );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
} else {
|
2014-10-22 22:08:20 -04:00
|
|
|
|
node.parentNode.insertBefore( wrap, node );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
2014-10-22 22:08:20 -04:00
|
|
|
|
|
|
|
|
|
editor.$( wrap ).find( 'dt.wp-caption-dt' ).append( node );
|
2015-04-18 17:56:27 -04:00
|
|
|
|
|
|
|
|
|
if ( parent && dom.isEmpty( parent ) ) {
|
|
|
|
|
dom.remove( parent );
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if ( wrap ) {
|
|
|
|
|
// Remove the caption wrapper and place the image in new paragraph
|
|
|
|
|
if ( imgNode.parentNode.nodeName === 'A' ) {
|
|
|
|
|
html = dom.getOuterHTML( imgNode.parentNode );
|
|
|
|
|
} else {
|
|
|
|
|
html = dom.getOuterHTML( imgNode );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
parent = dom.create( 'p', {}, html );
|
|
|
|
|
dom.insertAfter( parent, wrap.parentNode );
|
|
|
|
|
editor.selection.select( parent );
|
|
|
|
|
editor.nodeChanged();
|
|
|
|
|
dom.remove( wrap.parentNode );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
imgNode = dom.get('__wp-temp-img-id');
|
|
|
|
|
dom.setAttrib( imgNode, 'id', imgId );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
event.imgData.node = imgNode;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'wpLoadImageData', function( event ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
var parent,
|
2014-02-10 18:48:12 -05:00
|
|
|
|
data = event.imgData.data,
|
|
|
|
|
imgNode = event.imgData.node;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
|
|
|
|
if ( parent = dom.getParent( imgNode, 'dl.wp-caption' ) ) {
|
|
|
|
|
parent = dom.select( 'dd.wp-caption-dd', parent )[0];
|
2013-12-30 22:10:11 -05:00
|
|
|
|
|
|
|
|
|
if ( parent ) {
|
|
|
|
|
data.caption = editor.serializer.serialize( parent )
|
|
|
|
|
.replace( /<br[^>]*>/g, '$&\n' ).replace( /^<p>/, '' ).replace( /<\/p>$/, '' );
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
dom.bind( editor.getDoc(), 'dragstart', function( event ) {
|
|
|
|
|
var node = editor.selection.getNode();
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
// Prevent dragging images out of the caption elements
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
if ( node.nodeName === 'IMG' && dom.getParent( node, '.wp-caption' ) ) {
|
|
|
|
|
event.preventDefault();
|
|
|
|
|
}
|
|
|
|
|
});
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
|
|
|
|
// Prevent IE11 from making dl.wp-caption resizable
|
|
|
|
|
if ( tinymce.Env.ie && tinymce.Env.ie > 10 ) {
|
|
|
|
|
// 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
|
|
|
|
|
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();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
|
2014-01-12 20:13:10 -05:00
|
|
|
|
editor.on( 'ObjectResized', function( event ) {
|
2014-05-29 03:51:14 -04:00
|
|
|
|
var node = event.target;
|
2014-01-12 20:13:10 -05:00
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
if ( node.nodeName === 'IMG' ) {
|
2014-05-29 03:51:14 -04:00
|
|
|
|
editor.undoManager.transact( function() {
|
|
|
|
|
var parent, width,
|
|
|
|
|
dom = editor.dom;
|
2014-03-24 20:16:14 -04:00
|
|
|
|
|
2014-05-29 03:51:14 -04:00
|
|
|
|
node.className = node.className.replace( /\bsize-[^ ]+/, '' );
|
2014-02-04 21:07:13 -05:00
|
|
|
|
|
2014-05-29 03:51:14 -04:00
|
|
|
|
if ( parent = dom.getParent( node, '.wp-caption' ) ) {
|
|
|
|
|
width = event.width || dom.getAttrib( node, 'width' );
|
Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.
There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.
As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding.
The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.
The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.
props obenland, azaozz.
see #26642. also fixes #9066.
Built from https://develop.svn.wordpress.org/trunk@27668
git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 22:05:14 -04:00
|
|
|
|
|
2014-05-29 03:51:14 -04:00
|
|
|
|
if ( width ) {
|
|
|
|
|
width = parseInt( width, 10 );
|
|
|
|
|
|
|
|
|
|
if ( ! editor.getParam( 'wpeditimage_html5_captions' ) ) {
|
|
|
|
|
width += 10;
|
|
|
|
|
}
|
Introduce HTML5 caption support.
When a theme supports HTML5 captions via add_theme_support( 'html5', 'caption' ), figure and figcaption will be used instead of div and p.
There's a bonus. But first, some history: Captions were introduced with an inline style set for the container. This remains, as it is there to force captions to wrap. But this inline style included an extra 10 pixels, which have vexxed theme developers for years. While these pixels were designed to ensure padding around floated images, modern themes handle this with grace. The additional pixels thus feel encumbering.
As the new HTML5 gallery support avoids outputting default gallery styles (again, irking theme developers for years; see #26697), the new HTML5 caption support will also ditch these 10 pixels of unwanted hand-holding.
The 10 pixels are also removed entirely in the visual editor (and more styles may also disappear here; see #26642), giving themes the power necessary to match the frontend styles.
The filter img_caption_shortcode_width added in 3.7 to work around this madness (see #14380) is skipped entirely when the theme supports HTML5 captions.
props obenland, azaozz.
see #26642. also fixes #9066.
Built from https://develop.svn.wordpress.org/trunk@27668
git-svn-id: http://core.svn.wordpress.org/trunk@27511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 22:05:14 -04:00
|
|
|
|
|
2014-05-29 03:51:14 -04:00
|
|
|
|
dom.setStyle( parent, 'width', width + 'px' );
|
|
|
|
|
}
|
2014-02-10 18:48:12 -05:00
|
|
|
|
}
|
2014-05-29 03:51:14 -04:00
|
|
|
|
});
|
2014-01-12 20:13:10 -05:00
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'BeforeExecCommand', function( event ) {
|
2014-11-12 19:56:22 -05:00
|
|
|
|
var node, p, DL, align, replacement,
|
2014-02-10 18:48:12 -05:00
|
|
|
|
cmd = event.command,
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
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();
|
|
|
|
|
}
|
2014-11-12 19:56:22 -05:00
|
|
|
|
} else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' || cmd === 'wpAlignNone' ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
node = editor.selection.getNode();
|
2014-11-12 19:56:22 -05:00
|
|
|
|
align = 'align' + cmd.slice( 7 ).toLowerCase();
|
|
|
|
|
DL = editor.dom.getParent( node, '.wp-caption' );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
2014-11-12 19:56:22 -05:00
|
|
|
|
if ( node.nodeName !== 'IMG' && ! DL ) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-11-12 19:56:22 -05:00
|
|
|
|
node = DL || node;
|
2014-08-03 20:52:17 -04:00
|
|
|
|
|
2014-11-12 19:56:22 -05:00
|
|
|
|
if ( editor.dom.hasClass( node, align ) ) {
|
|
|
|
|
replacement = ' alignnone';
|
|
|
|
|
} else {
|
|
|
|
|
replacement = ' ' + align;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
2014-01-14 00:52:09 -05:00
|
|
|
|
|
2015-05-25 02:35:28 -04:00
|
|
|
|
node.className = trim( node.className.replace( / ?align(left|center|right|none)/g, '' ) + replacement );
|
2014-11-12 19:56:22 -05:00
|
|
|
|
|
|
|
|
|
editor.nodeChanged();
|
|
|
|
|
event.preventDefault();
|
|
|
|
|
|
2015-03-11 18:41:26 -04:00
|
|
|
|
if ( toolbar ) {
|
|
|
|
|
toolbar.reposition();
|
2014-01-14 00:52:09 -05:00
|
|
|
|
}
|
2014-12-05 19:33:24 -05:00
|
|
|
|
|
|
|
|
|
editor.fire( 'ExecCommand', {
|
|
|
|
|
command: cmd,
|
|
|
|
|
ui: event.ui,
|
|
|
|
|
value: event.value
|
|
|
|
|
} );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'keydown', function( event ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
var node, wrap, P, spacer,
|
|
|
|
|
selection = editor.selection,
|
2014-03-27 14:07:14 -04:00
|
|
|
|
keyCode = event.keyCode,
|
2014-08-19 15:14:16 -04:00
|
|
|
|
dom = editor.dom,
|
|
|
|
|
VK = tinymce.util.VK;
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
2014-08-19 15:14:16 -04:00
|
|
|
|
if ( keyCode === VK.ENTER ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
// When pressing Enter inside a caption move the caret to a new parapraph under it
|
2014-02-10 18:48:12 -05:00
|
|
|
|
node = selection.getNode();
|
|
|
|
|
wrap = dom.getParent( node, 'div.mceTemp' );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
|
|
|
|
if ( wrap ) {
|
2014-02-10 18:48:12 -05:00
|
|
|
|
dom.events.cancel( event ); // Doesn't cancel all :(
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
|
|
|
|
|
// Remove any extra dt and dd cleated on pressing Enter...
|
|
|
|
|
tinymce.each( dom.select( 'dt, dd', wrap ), function( element ) {
|
|
|
|
|
if ( dom.isEmpty( element ) ) {
|
|
|
|
|
dom.remove( element );
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
spacer = tinymce.Env.ie && tinymce.Env.ie < 11 ? '' : '<br data-mce-bogus="1" />';
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
P = dom.create( 'p', null, spacer );
|
2014-02-10 18:48:12 -05:00
|
|
|
|
|
|
|
|
|
if ( node.nodeName === 'DD' ) {
|
|
|
|
|
dom.insertAfter( P, wrap );
|
|
|
|
|
} else {
|
|
|
|
|
wrap.parentNode.insertBefore( P, wrap );
|
|
|
|
|
}
|
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
editor.nodeChanged();
|
2014-02-10 18:48:12 -05:00
|
|
|
|
selection.setCursorLocation( P, 0 );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
2014-08-19 15:14:16 -04:00
|
|
|
|
} else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
node = selection.getNode();
|
|
|
|
|
|
|
|
|
|
if ( node.nodeName === 'DIV' && dom.hasClass( node, 'mceTemp' ) ) {
|
|
|
|
|
wrap = node;
|
|
|
|
|
} else if ( node.nodeName === 'IMG' || node.nodeName === 'DT' || node.nodeName === 'A' ) {
|
|
|
|
|
wrap = dom.getParent( node, 'div.mceTemp' );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ( wrap ) {
|
2014-02-10 18:48:12 -05:00
|
|
|
|
dom.events.cancel( event );
|
|
|
|
|
removeImage( node );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
return false;
|
|
|
|
|
}
|
2014-02-10 18:48:12 -05:00
|
|
|
|
}
|
|
|
|
|
});
|
2014-01-28 16:17:12 -05:00
|
|
|
|
|
2014-08-10 00:22:15 -04:00
|
|
|
|
// 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.
|
|
|
|
|
// 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();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
editor.wpSetImgCaption = function( content ) {
|
|
|
|
|
return parseShortcode( content );
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
editor.wpGetImgCaption = function( content ) {
|
|
|
|
|
return getShortcode( content );
|
|
|
|
|
};
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'BeforeSetContent', function( event ) {
|
2014-05-29 03:51:14 -04:00
|
|
|
|
if ( event.format !== 'raw' ) {
|
|
|
|
|
event.content = editor.wpSetImgCaption( event.content );
|
|
|
|
|
}
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
});
|
|
|
|
|
|
2014-02-10 18:48:12 -05:00
|
|
|
|
editor.on( 'PostProcess', function( event ) {
|
|
|
|
|
if ( event.get ) {
|
|
|
|
|
event.content = editor.wpGetImgCaption( event.content );
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
2015-03-11 15:12:28 -04:00
|
|
|
|
// Add to editor.wp
|
|
|
|
|
editor.wp = editor.wp || {};
|
|
|
|
|
editor.wp.isPlaceholder = isPlaceholder;
|
|
|
|
|
|
|
|
|
|
// Back-compat.
|
TinyMCE 4.0.12, first run.
- Removes wp-tinymce-schema.js and mark-loaded.js, no longer needed.
- Removes the inlinepopups and most of the wpdialogs plugins; wpdialog.js is moved to wp-includes/js.
- Adds charmap, compat3x, image, link and textcolor plugins, previously contained in /themes/advanced.
- Updates the wordpress, wpeditimage, wpfullscreen, wpgallery and wplink plugins.
- Updates DFW, wp-admin/js/wp-fullscreen.js.
See #24067.
Built from https://develop.svn.wordpress.org/trunk@26876
git-svn-id: http://core.svn.wordpress.org/trunk@26759 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-28 18:53:15 -05:00
|
|
|
|
return {
|
|
|
|
|
_do_shcode: parseShortcode,
|
|
|
|
|
_get_shcode: getShortcode
|
|
|
|
|
};
|
|
|
|
|
});
|