From 294bcb0e1133e4ffc4604e893fdce5124884efa3 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 11 Jan 2007 03:26:48 +0000 Subject: [PATCH] RTE link behavior fix from andy. fixes #3466 git-svn-id: http://svn.automattic.com/wordpress/trunk@4719 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js | 2 ++ wp-includes/js/tinymce/tiny_mce.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js index c005a9e7be..304e478689 100644 --- a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js @@ -558,6 +558,8 @@ TinyMCE_Window.prototype.close = function() { e.parentNode.removeChild(e); mcWindows.setDocumentLock(false); + + tinyMCE.selectedInstance.getWin().focus(); }; TinyMCE_Window.prototype.onMouseMove = function(e) { diff --git a/wp-includes/js/tinymce/tiny_mce.js b/wp-includes/js/tinymce/tiny_mce.js index ecd78a231e..aece8d1475 100644 --- a/wp-includes/js/tinymce/tiny_mce.js +++ b/wp-includes/js/tinymce/tiny_mce.js @@ -2813,7 +2813,7 @@ TinyMCE_Control.prototype = { if (tinyMCE.isGecko && this.getSel().isCollapsed) { focusElm = tinyMCE.getParentElement(focusElm, 'A'); - if (focusElm) + if (focusElm && this.getRng(0).endOffset > 0 && this.getRng(0).endOffset != focusElm.innerHTML.length) this.selection.selectNode(focusElm, false); }