Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE:

Browse Source 
- Use `data-wp-*` for processing and styling of the `more` and `nextpage` placeholders, keep the class names for back-compat. Makes them "immune" to "Clear formatting".
- Translate the titles of the placeholders.
Fixes #28772.
Built from https://develop.svn.wordpress.org/trunk@29317


git-svn-id: http://core.svn.wordpress.org/trunk@29098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-07-28 23:45:18 +00:00
parent 004da2f6ba
commit c8cec032ae
5 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/class-wp-editor.php
View File

@ -944,6 +944,7 @@ final class _WP_Editors {
'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),
'Toolbar Toggle' => __( 'Toolbar Toggle' ),
'Insert Read More tag' => __( 'Insert Read More tag' ),
'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor
'Distraction Free Writing' => __( 'Distraction Free Writing' ),
);

40
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -83,18 +83,24 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
// Replace Read More/Next Page tags with images
editor.on( 'BeforeSetContent', function( e ) {
var title;
if ( e.content ) {
if ( e.content.indexOf( '<!--more' ) !== -1 ) {
title = editor.editorManager.i18n.translate( 'Read more...' );
e.content = e.content.replace( /<!--more(.*?)-->/g, function( match, moretext ) {
return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="' + moretext + '" ' +
'class="wp-more-tag mce-wp-more" title="Read More..." data-mce-resize="false" data-mce-placeholder="1" />';
return '<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="more" data-wp-more-text="' + moretext + '" ' +
'class="wp-more-tag mce-wp-more" title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />';
});
}
if ( e.content.indexOf( '<!--nextpage-->' ) !== -1 ) {
title = editor.editorManager.i18n.translate( 'Page break' );
e.content = e.content.replace( /<!--nextpage-->/g,
'<img src="' + tinymce.Env.transparentSrc + '" class="wp-more-tag mce-wp-nextpage" ' +
'title="Page break" data-mce-resize="false" data-mce-placeholder="1" />' );
'<img src="' + tinymce.Env.transparentSrc + '" data-wp-more="nextpage" class="wp-more-tag mce-wp-nextpage" ' +
'title="' + title + '" data-mce-resize="false" data-mce-placeholder="1" />' );
}
}
});
@ -105,17 +111,15 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
e.content = e.content.replace(/<img[^>]+>/g, function( image ) {
var match, moretext = '';
if ( image.indexOf('wp-more-tag') !== -1 ) {
if ( image.indexOf('mce-wp-more') !== -1 ) {
if ( match = image.match( /data-wp-more="([^"]+)"/ ) ) {
if ( image.indexOf( 'data-wp-more="more"' ) !== -1 ) {
if ( match = image.match( /data-wp-more-text="([^"]+)"/ ) ) {
moretext = match[1];
}
image = '<!--more' + moretext + '-->';
} else if ( image.indexOf('mce-wp-nextpage') !== -1 ) {
} else if ( image.indexOf( 'data-wp-more="nextpage"' ) !== -1 ) {
image = '<!--nextpage-->';
}
}
return image;
});
@ -123,16 +127,11 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
});
// Display the tag name instead of img in element path
editor.on( 'ResolveName', function( e ) {
var dom = editor.dom,
target = e.target;
editor.on( 'ResolveName', function( event ) {
var attr;
if ( target.nodeName === 'IMG' && dom.hasClass( target, 'wp-more-tag' ) ) {
if ( dom.hasClass( target, 'mce-wp-more' ) ) {
e.name = 'more';
} else if ( dom.hasClass( target, 'mce-wp-nextpage' ) ) {
e.name = 'nextpage';
}
if ( event.target.nodeName === 'IMG' && ( attr = editor.dom.getAttrib( event.target, 'data-wp-more' ) ) ) {
event.name = attr;
}
});
@ -145,9 +144,10 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
tag = tag || 'more';
classname += ' mce-wp-' + tag;
title = tag === 'more' ? 'More...' : 'Next Page';
title = tag === 'more' ? 'Read more...' : 'Next page';
title = editor.editorManager.i18n.translate( title );
html = '<img src="' + tinymce.Env.transparentSrc + '" title="' + title + '" class="' + classname + '" ' +
'data-mce-resize="false" data-mce-placeholder="1" />';
'data-wp-more="' + tag + '" data-mce-resize="false" data-mce-placeholder="1" />';
// Most common case
if ( node.nodeName === 'BODY' || ( node.nodeName === 'P' && node.parentNode.nodeName === 'BODY' ) ) {

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
wp-includes/js/tinymce/skins/wordpress/wp-content.css
View File

@ -122,8 +122,7 @@ img::selection {
padding: 0;
}
.mce-content-body img.mce-wp-nextpage,
.mce-content-body img.mce-wp-more {
.mce-content-body img[data-wp-more] {
border: 0;
-webkit-box-shadow: none;
box-shadow: none;
@ -135,16 +134,15 @@ img::selection {
cursor: default;
}
.mce-content-body img.mce-wp-nextpage[data-mce-selected],
.mce-content-body img.mce-wp-more[data-mce-selected] {
.mce-content-body img[data-wp-more][data-mce-selected] {
outline: 1px dotted #888;
}
.mce-content-body img.mce-wp-more {
.mce-content-body img[data-wp-more="more"] {
background: transparent url( images/more.png ) repeat-y scroll center center;
}
.mce-content-body img.mce-wp-nextpage {
.mce-content-body img[data-wp-more="nextpage"] {
background: transparent url( images/pagebreak.png ) repeat-y scroll center center;
}

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.