WordPress 3.9.1

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / wplink / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wplink/plugin.js b/wp-includes/js/tinymce/plugins/wplink/plugin.js
index 1d6820a12baafc4adbc0cc4d9051f3a98fd36ef1..d992360b86552f462ec4a21fc93b0961f538d313 100644 (file)
--- 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', {