Update to TinyMCE 3.5.2

1 files changed, 18 insertions, 6 deletions

diff --git a/program/js/tiny_mce/themes/advanced/js/anchor.js b/program/js/tiny_mce/themes/advanced/js/anchor.js
index 2940db359..2909a3a4d 100644
--- a/program/js/tiny_mce/themes/advanced/js/anchor.js
+++ b/program/js/tiny_mce/themes/advanced/js/anchor.js
@@ -6,7 +6,7 @@ var AnchorDialog = {
 

 		this.editor = ed;

 		elm = ed.dom.getParent(ed.selection.getNode(), 'A');

-		v = ed.dom.getAttrib(elm, 'name');

+		v = ed.dom.getAttrib(elm, 'name') || ed.dom.getAttrib(elm, 'id');

 

 		if (v) {

 			this.action = 'update';

@@ -17,7 +17,7 @@ var AnchorDialog = {
 	},

 

 	update : function() {

-		var ed = this.editor, elm, name = document.forms[0].anchorName.value;

+		var ed = this.editor, elm, name = document.forms[0].anchorName.value, attribName;

 

 		if (!name || !/^[a-z][a-z0-9\-\_:\.]*$/i.test(name)) {

 			tinyMCEPopup.alert('advanced_dlg.anchor_invalid');

@@ -29,13 +29,25 @@ var AnchorDialog = {
 		if (this.action != 'update')

 			ed.selection.collapse(1);

 

+		var aRule = ed.schema.getElementRule('a');

+		if (!aRule || aRule.attributes.name) {

+			attribName = 'name';

+		} else {

+			attribName = 'id';

+		}

+

 		elm = ed.dom.getParent(ed.selection.getNode(), 'A');

 		if (elm) {

-			elm.setAttribute('name', name);

-			elm.name = name;

-		} else

+			elm.setAttribute(attribName, name);

+			elm[attribName] = name;

+			ed.undoManager.add();

+		} else {

 			// create with zero-sized nbsp so that in Webkit where anchor is on last line by itself caret cannot be placed after it

-			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, '\uFEFF'));

+			var attrs =  {'class' : 'mceItemAnchor'};

+			attrs[attribName] = name;

+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', attrs, '\uFEFF'));

+			ed.nodeChanged();

+		}

 

 		tinyMCEPopup.close();

 	}