From b2ff3d44610e1836fe7080a7afffdf4f6ebd32da Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 25 Nov 2007 11:21:55 -0500
Subject: [PATCH] Don't create default folders by default

---
 program/js/tiny_mce/plugins/table/jscripts/table.js |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/program/js/tiny_mce/plugins/table/jscripts/table.js b/program/js/tiny_mce/plugins/table/jscripts/table.js
index 02eaeee..4a0ee3b 100644
--- a/program/js/tiny_mce/plugins/table/jscripts/table.js
+++ b/program/js/tiny_mce/plugins/table/jscripts/table.js
@@ -3,10 +3,15 @@
 function insertTable() {
 	var formObj = document.forms[0];
 	var inst = tinyMCE.selectedInstance;
-	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className;
-	var html = '';
+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption;
+	var html = '', capEl;
 	var elm = tinyMCE.tableElm;
 	var cellLimit, rowLimit, colLimit;
+
+	if (!AutoValidator.validate(formObj)) {
+		alert(tinyMCE.getLang('lang_invalid_data'));
+		return false;
+	}
 
 	tinyMCEPopup.restoreSelection();
 
@@ -28,6 +33,7 @@
 	dir = formObj.elements['dir'].value;
 	lang = formObj.elements['lang'].value;
 	background = formObj.elements['backgroundimage'].value;
+	caption = formObj.elements['caption'].checked;
 
 	cellLimit = tinyMCE.getParam('table_cell_limit', false);
 	rowLimit = tinyMCE.getParam('table_row_limit', false);
@@ -59,6 +65,17 @@
 		tinyMCE.setAttrib(elm, 'summary', summary);
 		tinyMCE.setAttrib(elm, 'dir', dir);
 		tinyMCE.setAttrib(elm, 'lang', lang);
+
+		capEl = elm.getElementsByTagName('caption')[0];
+
+		if (capEl && !caption)
+			capEl.parentNode.removeChild(capEl);
+
+		if (!capEl && caption) {
+			capEl = elm.ownerDocument.createElement('caption');
+			capEl.innerHTML = '&nbsp;';
+			elm.insertBefore(capEl, elm.firstChild);
+		}
 
 		// Not inline styles
 		if (!tinyMCE.getParam("inline_styles"))
@@ -127,8 +144,10 @@
 	html += makeAttrib('summary', summary);
 	html += makeAttrib('dir', dir);
 	html += makeAttrib('lang', lang);
-
 	html += '>';
+
+	if (caption)
+		html += '<caption>&nbsp;</caption>';
 
 	for (var y=0; y<rows; y++) {
 		html += "<tr>";
@@ -180,7 +199,7 @@
 	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
 	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
 
-	var cols = 2, rows = 2, border = 0, cellpadding = "", cellspacing = "";
+	var cols = 2, rows = 2, border = tinyMCE.getParam('table_default_border', '0'), cellpadding = tinyMCE.getParam('table_default_cellpadding', ''), cellspacing = tinyMCE.getParam('table_default_cellspacing', '');
 	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
 	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "";
 	var inst = tinyMCE.selectedInstance;
@@ -218,6 +237,7 @@
 		dir = tinyMCE.getAttrib(tinyMCE.tableElm, 'dir');
 		lang = tinyMCE.getAttrib(tinyMCE.tableElm, 'lang');
 		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+		formObj.caption.checked = tinyMCE.tableElm.getElementsByTagName('caption').length > 0;
 
 		orgTableWidth = width;
 		orgTableHeight = height;

--
Gitblit v1.9.1