Merge tag '1.8.14' of git://github.com/Elgg/Elgg into foxglove-3

Elgg 1.8.14

Conflicts:
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
	mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js

1 files changed, 17 insertions, 0 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
index a13d69592..0c678de46 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
@@ -25,6 +25,7 @@ function init() {
 	var dir = dom.getAttrib(trElm, 'dir');

 

 	selectByValue(formObj, 'rowtype', rowtype);

+	setActionforRowType(formObj, rowtype);

 

 	// Any cells selected

 	if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) {

@@ -234,4 +235,20 @@ function changedColor() {
 	formObj.style.value = dom.serializeStyle(st);

 }

 

+function changedRowType() {

+	var formObj = document.forms[0];

+	var rowtype = getSelectValue(formObj, 'rowtype');

+

+	setActionforRowType(formObj, rowtype);

+

+}

+

+function setActionforRowType(formObj, rowtype) {

+	if (rowtype === "tbody") {

+		formObj.action.disabled = false;

+	} else {

+		selectByValue(formObj, 'action', "row");

+		formObj.action.disabled = true;

+	}

+}

 tinyMCEPopup.onInit.add(init);