X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftiny_mce%2Fthemes%2Fadvanced%2Fjs%2Fanchor.js;h=e528e4f42f78a571657b6abe88f429a1d57400dd;hb=b05f4eef4014db3885787ef15107cba93c932ac9;hp=b5efd1ec9736d60bdd261cdde9987f15e4d095c2;hpb=d2e69f5f0bf088b1137aad70ed4a571fd9bde577;p=citadel.git

diff --git a/webcit/tiny_mce/themes/advanced/js/anchor.js b/webcit/tiny_mce/themes/advanced/js/anchor.js
index b5efd1ec9..e528e4f42 100644
--- a/webcit/tiny_mce/themes/advanced/js/anchor.js
+++ b/webcit/tiny_mce/themes/advanced/js/anchor.js
@@ -5,7 +5,7 @@ var AnchorDialog = {
 		var action, elm, f = document.forms[0];
 
 		this.editor = ed;
-		elm = ed.dom.getParent(ed.selection.getNode(), 'A,IMG');
+		elm = ed.dom.getParent(ed.selection.getNode(), 'A');
 		v = ed.dom.getAttrib(elm, 'name');
 
 		if (v) {
@@ -17,18 +17,23 @@ var AnchorDialog = {
 	},
 
 	update : function() {
-		var ed = this.editor;
-		
+		var ed = this.editor, elm, name = document.forms[0].anchorName.value;
+
+		if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {
+			tinyMCEPopup.alert('advanced_dlg.anchor_invalid');
+			return;
+		}
+
 		tinyMCEPopup.restoreSelection();
 
 		if (this.action != 'update')
 			ed.selection.collapse(1);
 
-		// Webkit acts weird if empty inline element is inserted so we need to use a image instead
-		if (tinymce.isWebKit)
-			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('img', {mce_name : 'a', name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}));
+		elm = ed.dom.getParent(ed.selection.getNode(), 'A');
+		if (elm)
+			elm.name = name;
 		else
-			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}, ''));
+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, ''));
 
 		tinyMCEPopup.close();
 	}