MINOR Updated TinyMCE dependency from 3.4.6 to 3.5

silverstripe · May 8, 2012 · c507efc · c507efc
1 parent 5bce342
commit c507efc
Show file tree

Hide file tree

Showing 90 changed files with 9,080 additions and 6,292 deletions.
diff --git a/thirdparty/tinymce/langs/el.js b/thirdparty/tinymce/langs/el.js
diff --git a/thirdparty/tinymce/plugins/advhr/langs/en_dlg.js b/thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
diff --git a/thirdparty/tinymce/plugins/advimage/langs/el_dlg.js b/thirdparty/tinymce/plugins/advimage/langs/el_dlg.js
diff --git a/thirdparty/tinymce/plugins/advimage/langs/en_dlg.js b/thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
diff --git a/thirdparty/tinymce/plugins/advimage/langs/ru_dlg.js b/thirdparty/tinymce/plugins/advimage/langs/ru_dlg.js
diff --git a/thirdparty/tinymce/plugins/advlink/js/advlink.js b/thirdparty/tinymce/plugins/advlink/js/advlink.js
@@ -54,6 +54,13 @@ function init() {
 		document.getElementById('popupurl').style.width = '180px';
 
 	elm = inst.dom.getParent(elm, "A");
+	if (elm == null) {
+		var prospect = inst.dom.create("p", null, inst.selection.getContent());
+		if (prospect.childNodes.length === 1) {
+			elm = prospect.firstChild;
+		}
+	}
+
 	if (elm != null && elm.nodeName == "A")
 		action = "update";
 
@@ -481,7 +488,7 @@ function getLinkListHTML(elm_id, target_form_element, onchange_func) {
 	var html = "";
 
 	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
-	html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += ' class="mceLinkList" onchange="this.form.' + target_form_element + '.value=';
 	html += 'this.options[this.selectedIndex].value;';
 
 	if (typeof(onchange_func) != "undefined")
@@ -503,7 +510,7 @@ function getTargetListHTML(elm_id, target_form_element) {
 	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
 	var html = '';
 
-	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onchange="this.form.' + target_form_element + '.value=';
 	html += 'this.options[this.selectedIndex].value;">';
 	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
 	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';