X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/022dfbbbe3215917d84708eb09acca93b21ae9e0..7688c6ba71852cd89123b62b2d57683535e4702a:/wp-includes/js/tinymce/themes/advanced/jscripts/anchor.js

diff --git a/wp-includes/js/tinymce/themes/advanced/jscripts/anchor.js b/wp-includes/js/tinymce/themes/advanced/jscripts/anchor.js
index a89f9729..f2e5d482 100644
--- a/wp-includes/js/tinymce/themes/advanced/jscripts/anchor.js
+++ b/wp-includes/js/tinymce/themes/advanced/jscripts/anchor.js
@@ -26,7 +26,7 @@ function init() {
 
 function insertAnchor() {
 	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
-	var name = document.forms[0].anchorName.value;
+	var name = document.forms[0].anchorName.value, e;
 
 	tinyMCEPopup.execCommand("mceBeginUndoLevel");
 
@@ -44,11 +44,26 @@ function insertAnchor() {
 		name = name.replace(/&/g, '&');
 		name = name.replace(/\"/g, '"');
 		name = name.replace(/</g, '&lt;');
-		name = name.replace(/>/g, '&gr;');
+		name = name.replace(/>/g, '&gt;');
 
-		html = '<a name="' + name + '"></a>';
+		// Fix for bug #1447335
+		if (tinyMCE.isGecko)
+			html = '<a id="mceNewAnchor" name="' + name + '"></a>';
+		else
+			html = '<a name="' + name + '"></a>';
 
 		tinyMCEPopup.execCommand("mceInsertContent", false, html);
+
+		// Fix for bug #1447335 force cursor after the anchor element
+		if (tinyMCE.isGecko) {
+			e = inst.getDoc().getElementById('mceNewAnchor');
+
+			if (e) {
+				inst.selection.selectNode(e, true, false, false);
+				e.removeAttribute('id');
+			}
+		}
+
 		tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
 	}