sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyMCE: include the upstream fix for inserting <hr> while the caret is in an inline element: b1618d1adb.

Browse Source 
Fixes #36165.

git-svn-id: https://develop.svn.wordpress.org/trunk@37074 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2016-03-23 21:44:05 +00:00
parent f903fb5160
commit 9f03a3bd5e
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wp-includes/js/tinymce/tinymce.js
View File

@ -23286,7 +23286,7 @@ define("tinymce/EditorCommands", [
} }
function moveSelectionToMarker(marker) { function moveSelectionToMarker(marker) {
var parentEditableFalseElm, parentNode, nextRng; var parentEditableFalseElm, parentBlock, nextRng;
function getContentEditableFalseParent(node) { function getContentEditableFalseParent(node) {
var root = editor.getBody(); var root = editor.getBody();
@ -23347,20 +23347,20 @@ define("tinymce/EditorCommands", [
} }
// Remove the marker node and set the new range // Remove the marker node and set the new range
parentNode = marker.parentNode; parentBlock = dom.getParent(marker, dom.isBlock);
dom.remove(marker); dom.remove(marker);
if (dom.isEmpty(parentNode) && dom.isBlock(parentNode)) { if (parentBlock && dom.isEmpty(parentBlock)) {
editor.$(parentNode).empty(); editor.$(parentBlock).empty();
rng.setStart(parentNode, 0); rng.setStart(parentBlock, 0);
rng.setEnd(parentNode, 0); rng.setEnd(parentBlock, 0);
if (!isTableCell(parentNode) && (nextRng = findNextCaretRng(rng))) { if (!isTableCell(parentBlock) && (nextRng = findNextCaretRng(rng))) {
rng = nextRng; rng = nextRng;
dom.remove(parentNode); dom.remove(parentBlock);
} else { } else {
dom.add(parentNode, dom.create('br', {'data-mce-bogus': '1'})); dom.add(parentBlock, dom.create('br', {'data-mce-bogus': '1'}));
} }
} }

2
src/wp-includes/js/tinymce/tinymce.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/wp-includes/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 36686;
* *
* @global string $tinymce_version * @global string $tinymce_version
*/ */
$tinymce_version = '4308-20160315'; $tinymce_version = '4308-20160323';
/** /**
* Holds the required PHP version * Holds the required PHP version