From db22ae4e32430a7e922ac104bf5ff8805c1800c5 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Tue, 22 Apr 2014 21:10:14 +0000 Subject: [PATCH] TinyMCE: fix the "active" state of the Link button when an image wrapped in a link is selected, see #27847, for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@28185 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wplink/plugin.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js index 1d6820a12b..d992360b86 100644 --- a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -15,8 +15,10 @@ tinymce.PluginManager.add( 'wplink', function( editor ) { editor.addShortcut( 'ctrl+k', '', 'WP_Link' ); function setState( button, node ) { - button.disabled( editor.selection.isCollapsed() && node.nodeName !== 'A' ); - button.active( node.nodeName === 'A' && ! node.name ); + var parent = editor.dom.getParent( node, 'a' ); + + button.disabled( ( editor.selection.isCollapsed() && ! parent ) || ( parent && ! parent.href ) ); + button.active( parent && parent.href ); } editor.addButton( 'link', {