Ticket #3466: tiny-fixes.diff

wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

@@ -558 +558 @@
         e.parentNode.removeChild(e);
 
         mcWindows.setDocumentLock(false);
+
+        tinyMCE.selectedInstance.getWin().focus();
 };
 
 TinyMCE_Window.prototype.onMouseMove = function(e) {

wp-includes/js/tinymce/tiny_mce.js

@@ -2813 +2813 @@
                                 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);
                                 }