summaryrefslogtreecommitdiff
path: root/program/js/tiny_mce/plugins/table/jscripts/table.js
diff options
context:
space:
mode:
Diffstat (limited to 'program/js/tiny_mce/plugins/table/jscripts/table.js')
-rw-r--r--program/js/tiny_mce/plugins/table/jscripts/table.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/program/js/tiny_mce/plugins/table/jscripts/table.js b/program/js/tiny_mce/plugins/table/jscripts/table.js
index 02eaeee27..6904ed0f7 100644
--- a/program/js/tiny_mce/plugins/table/jscripts/table.js
+++ b/program/js/tiny_mce/plugins/table/jscripts/table.js
@@ -8,6 +8,11 @@ function insertTable() {
var elm = tinyMCE.tableElm;
var cellLimit, rowLimit, colLimit;
+ if (!AutoValidator.validate(formObj)) {
+ alert(tinyMCE.getLang('lang_invalid_data'));
+ return false;
+ }
+
tinyMCEPopup.restoreSelection();
// Get form data
@@ -180,7 +185,7 @@ function init() {
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;