vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-12 12:50:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TinyMCE: wptextpattern: Handle unconverted inline patterns

Browse Source 
Make sure the right text is matched when it already contains characters of the pattern.
Adds two more unit tests.

Fixes #37693.



git-svn-id: https://develop.svn.wordpress.org/trunk@39075 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ella van Dorpe
2016-11-01 20:05:48 +00:00
parent 9cac5048b4
commit 0f00396bb6
3 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/js/tinymce/plugins/wptextpattern/plugin.js
+33 -22
View File
@@ -15,15 +15,27 @@
return;
}
/**
* Escapes characters for use in a Regular Expression.
*
* @param {String} string Characters to escape
*
* @return {String} Escaped characters
*/
function escapeRegExp( string ) {
return string.replace( /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&' );
}
tinymce.PluginManager.add( 'wptextpattern', function( editor ) {
var VK = tinymce.util.VK;
var settings = editor.settings.wptextpattern || {};
var spacePatterns = [
var spacePatterns = settings.space || [
{ regExp: /^[*-]\s/, cmd: 'InsertUnorderedList' },
{ regExp: /^1[.)]\s/, cmd: 'InsertOrderedList' }
];
var enterPatterns = [
var enterPatterns = settings.enter || [
{ start: '##', format: 'h2' },
{ start: '###', format: 'h3' },
{ start: '####', format: 'h4' },
@@ -33,7 +45,7 @@
{ regExp: /^(-){3,}$/, element: 'hr' }
];
var inlinePatterns = [
var inlinePatterns = settings.inline || [
{ start: '`', end: '`', format: 'code' }
];
@@ -81,40 +93,39 @@
var format;
var zero;
// We need a non empty text node with an offset greater than zero.
if ( ! node || node.nodeType !== 3 || ! node.data.length || ! offset ) {
return;
}
// The ending character should exist in the patterns registered.
if ( tinymce.inArray( chars, node.data.charAt( offset - 1 ) ) === -1 ) {
return;
}
function findStart( node ) {
var i = inlinePatterns.length;
var offset;
var string = node.data.slice( 0, offset );
while ( i-- ) {
pattern = inlinePatterns[ i ];
offset = node.data.indexOf( pattern.end );
tinymce.each( inlinePatterns, function( p ) {
var regExp = new RegExp( escapeRegExp( p.start ) + '\\S+' + escapeRegExp( p.end ) + '$' );
var match = string.match( regExp );
if ( offset !== -1 ) {
return offset;
}
if ( ! match ) {
return;
}
}
startOffset = findStart( node );
endOffset = node.data.lastIndexOf( pattern.end );
// Don't allow pattern characters in the text.
if ( node.data.slice( match.index + p.start.length, offset - p.end.length ).indexOf( p.start.slice( 0, 1 ) ) !== -1 ) {
return;
}
if ( startOffset === endOffset || endOffset === -1 ) {
return;
}
startOffset = match.index;
endOffset = offset - p.end.length;
pattern = p;
if ( endOffset - startOffset <= pattern.start.length ) {
return;
}
return false;
} );
if ( node.data.slice( startOffset + pattern.start.length, endOffset ).indexOf( pattern.start.slice( 0, 1 ) ) !== -1 ) {
if ( ! pattern ) {
return;
}