From e4426def6d30d301a3f2eb8f7270345d9781edfe Mon Sep 17 00:00:00 2001 From: donncha Date: Thu, 11 Jan 2007 15:57:00 +0000 Subject: WP Merge to rev 4721 git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@840 7be80a69-a1ef-0310-a953-fb0f7c49ff36 --- 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(-) (limited to 'wp-includes/js/tinymce') diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js index c005a9e..304e478 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 ecd78a2..aece8d1 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); } -- cgit