From 86494259065cf9d45eb1db2a76e15140368f8886 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Thu, 1 May 2014 04:43:16 +0000
Subject: [PATCH] TinyMCE: fix the "active" state of the Link button when an
 image wrapped in a link is selected.

Merges [28185] to the 3.9 branch.

props azaozz.
fixes #27847.

Built from https://develop.svn.wordpress.org/branches/3.9@28232


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../js/tinymce/plugins/wplink/plugin.js       |   6 ++++--
 .../js/tinymce/plugins/wplink/plugin.min.js   |   2 +-
 wp-includes/js/tinymce/wp-tinymce.js.gz       | Bin 122922 -> 122927 bytes
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js
index 1d6820a12b..d992360b86 100644
--- a/wp-includes/js/tinymce/plugins/wplink/plugin.js
+++ b/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', {
diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js
index af8751d289..dc282b9f3c 100644
--- a/wp-includes/js/tinymce/plugins/wplink/plugin.min.js
+++ b/wp-includes/js/tinymce/plugins/wplink/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("wplink",function(a){function b(b,c){b.disabled(a.selection.isCollapsed()&&"A"!==c.nodeName),b.active("A"===c.nodeName&&!c.name)}var c;a.addCommand("WP_Link",function(){c&&c.disabled()||"undefined"==typeof window.wpLink||window.wpLink.open(a.id)}),a.addShortcut("alt+shift+a","","WP_Link"),a.addShortcut("ctrl+k","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Alt+Shift+A",cmd:"WP_Link",onPostRender:function(){c=this,a.on("nodechange",function(a){b(c,a.element)})}}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",onPostRender:function(){var c=this;a.on("nodechange",function(a){b(c,a.element)})}}),a.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Alt+Shift+A",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("wplink",function(a){function b(b,c){var d=a.dom.getParent(c,"a");b.disabled(a.selection.isCollapsed()&&!d||d&&!d.href),b.active(d&&d.href)}var c;a.addCommand("WP_Link",function(){c&&c.disabled()||"undefined"==typeof window.wpLink||window.wpLink.open(a.id)}),a.addShortcut("alt+shift+a","","WP_Link"),a.addShortcut("ctrl+k","","WP_Link"),a.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Alt+Shift+A",cmd:"WP_Link",onPostRender:function(){c=this,a.on("nodechange",function(a){b(c,a.element)})}}),a.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",onPostRender:function(){var c=this;a.on("nodechange",function(a){b(c,a.element)})}}),a.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Alt+Shift+A",cmd:"WP_Link",stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/wp-includes/js/tinymce/wp-tinymce.js.gz b/wp-includes/js/tinymce/wp-tinymce.js.gz
index 814b05e57f09f6ca02757afb0e4d0ab58c614e02..6b291926366fb7062dedf44c6209e8cc940fc627 100644
GIT binary patch
delta 1639
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

delta 1618
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
Q5mb}@f20ION_?IL0KL68rT_o{