Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 07:07:38 +02:00
Code Issues Projects Releases Wiki Activity

Editor wpLink: swap the order of innerText and textContent to avoid getting styled text in IE.

Browse Source 
Props dougwollison.
Fixes #36783.
Built from https://develop.svn.wordpress.org/trunk@37621


git-svn-id: http://core.svn.wordpress.org/trunk@37589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-06-02 03:09:28 +00:00
parent fc1db9b413
commit c59504f760
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/wplink.js
View File

@ -228,7 +228,7 @@ var wpLink;
onlyText = this.hasSelectedText( linkNode );
if ( linkNode ) {
linkText = linkNode.innerText || linkNode.textContent;
linkText = linkNode.textContent || linkNode.innerText;
href = editor.dom.getAttrib( linkNode, 'href' );
if ( ! $.trim( linkText ) ) {

2
wp-includes/js/wplink.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37620';
$wp_version = '4.6-alpha-37621';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.