tinyMCEPopup.restoreSelection();\r
\r
if (!AutoValidator.validate(formObj)) {\r
- tinyMCEPopup.alert(inst.getLang('invalid_data'));\r
+ tinyMCEPopup.alert(AutoValidator.getErrorMessages(formObj).join('. ') + '.');\r
return false;\r
}\r
\r
// Get form data\r
cols = formObj.elements['cols'].value;\r
rows = formObj.elements['rows'].value;\r
- border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;\r
+ border = formObj.elements['border'].value != "" ? formObj.elements['border'].value : 0;\r
cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";\r
cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";\r
align = getSelectValue(formObj, "align");\r
\r
// Update table\r
if (action == "update") {\r
- inst.execCommand('mceBeginUndoLevel');\r
-\r
dom.setAttrib(elm, 'cellPadding', cellpadding, true);\r
dom.setAttrib(elm, 'cellSpacing', cellspacing, true);\r
dom.setAttrib(elm, 'border', border);\r
capEl = elm.ownerDocument.createElement('caption');\r
\r
if (!tinymce.isIE)\r
- capEl.innerHTML = '<br _mce_bogus="1"/>';\r
+ capEl.innerHTML = '<br data-mce-bogus="1"/>';\r
\r
elm.insertBefore(capEl, elm.firstChild);\r
}\r
html += makeAttrib('border', border);\r
html += makeAttrib('cellpadding', cellpadding);\r
html += makeAttrib('cellspacing', cellspacing);\r
- html += makeAttrib('_mce_new', '1');\r
+ html += makeAttrib('data-mce-new', '1');\r
\r
if (width && inst.settings.inline_styles) {\r
if (style)\r
\r
if (caption) {\r
if (!tinymce.isIE)\r
- html += '<caption><br _mce_bogus="1"/></caption>';\r
+ html += '<caption><br data-mce-bogus="1"/></caption>';\r
else\r
html += '<caption></caption>';\r
}\r
\r
for (var x=0; x<cols; x++) {\r
if (!tinymce.isIE)\r
- html += '<td><br _mce_bogus="1"/></td>';\r
+ html += '<td><br data-mce-bogus="1"/></td>';\r
else\r
html += '<td></td>';\r
}\r
\r
html += "</table>";\r
\r
- inst.execCommand('mceBeginUndoLevel');\r
-\r
// Move table\r
if (inst.settings.fix_table_elements) {\r
var patt = '';\r
} else\r
inst.execCommand('mceInsertContent', false, html);\r
\r
- tinymce.each(dom.select('table[_mce_new]'), function(node) {\r
+ tinymce.each(dom.select('table[data-mce-new]'), function(node) {\r
var td = dom.select('td', node);\r
\r
- inst.selection.select(td[0], true);\r
- inst.selection.collapse();\r
+ try {\r
+ // IE9 might fail to do this selection\r
+ inst.selection.select(td[0], true);\r
+ inst.selection.collapse();\r
+ } catch (ex) {\r
+ // Ignore\r
+ }\r
\r
- dom.setAttrib(node, '_mce_new', '');\r
+ dom.setAttrib(node, 'data-mce-new', '');\r
});\r
\r
inst.addVisual();\r
\r
var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');\r
var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";\r
- var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;\r
+ var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules = "", frame = "";\r
var inst = tinyMCEPopup.editor, dom = inst.dom;\r
var formObj = document.forms[0];\r
var elm = dom.getParent(inst.selection.getNode(), "table");\r