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 = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value;\r
- frame = formObj.elements['frame'].options[formObj.elements['frame'].selectedIndex].value;\r
- rules = formObj.elements['rules'].options[formObj.elements['rules'].selectedIndex].value;\r
+ align = getSelectValue(formObj, "align");\r
+ frame = getSelectValue(formObj, "tframe");\r
+ rules = getSelectValue(formObj, "rules");\r
width = formObj.elements['width'].value;\r
height = formObj.elements['height'].value;\r
bordercolor = formObj.elements['bordercolor'].value;\r
bgcolor = formObj.elements['bgcolor'].value;\r
- className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value;\r
+ className = getSelectValue(formObj, "class");\r
id = formObj.elements['id'].value;\r
summary = formObj.elements['summary'].value;\r
style = formObj.elements['style'].value;\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
+\r
+ if (!isCssSize(border)) {\r
+ dom.setAttrib(elm, 'border', border);\r
+ } else {\r
+ dom.setAttrib(elm, 'border', '');\r
+ }\r
+\r
+ if (border == '') {\r
+ dom.setStyle(elm, 'border-width', '');\r
+ dom.setStyle(elm, 'border', '');\r
+ dom.setAttrib(elm, 'border', '');\r
+ }\r
+\r
dom.setAttrib(elm, 'align', align);\r
dom.setAttrib(elm, 'frame', frame);\r
dom.setAttrib(elm, 'rules', rules);\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
if (bordercolor != "") {\r
elm.style.borderColor = bordercolor;\r
elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;\r
- elm.style.borderWidth = border == "" ? "1px" : border;\r
+ elm.style.borderWidth = cssSize(border);\r
} else\r
elm.style.borderColor = '';\r
\r
//elm.outerHTML = elm.outerHTML;\r
\r
inst.nodeChanged();\r
- inst.execCommand('mceEndUndoLevel');\r
+ inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});\r
\r
// Repaint if dimensions changed\r
if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)\r
html += '<table';\r
\r
html += makeAttrib('id', id);\r
- html += makeAttrib('border', border);\r
+ if (!isCssSize(border)) {\r
+ html += makeAttrib('border', border);\r
+ }\r
+\r
html += makeAttrib('cellpadding', cellpadding);\r
html += makeAttrib('cellspacing', cellspacing);\r
+ html += makeAttrib('data-mce-new', '1');\r
\r
if (width && inst.settings.inline_styles) {\r
if (style)\r
style += '; ';\r
\r
+ // Force px\r
+ if (/^[0-9\.]+$/.test(width))\r
+ width += 'px';\r
+\r
style += 'width: ' + width;\r
} else\r
html += makeAttrib('width', width);\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
- inst.execCommand('mceInsertContent', false, html);\r
+ // Move table\r
+ if (inst.settings.fix_table_elements) {\r
+ var patt = '';\r
+\r
+ inst.focus();\r
+ inst.selection.setContent('<br class="_mce_marker" />');\r
+\r
+ tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {\r
+ if (patt)\r
+ patt += ',';\r
+\r
+ patt += n + ' ._mce_marker';\r
+ });\r
+\r
+ tinymce.each(inst.dom.select(patt), function(n) {\r
+ inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);\r
+ });\r
+\r
+ dom.setOuterHTML(dom.select('br._mce_marker')[0], html);\r
+ } else\r
+ inst.execCommand('mceInsertContent', false, html);\r
+\r
+ tinymce.each(dom.select('table[data-mce-new]'), function(node) {\r
+ // Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document\r
+ if (tinymce.isIE && node.nextSibling == null) {\r
+ dom.insertAfter(dom.create('p'), node);\r
+ }\r
+\r
+ var tdorth = dom.select('td,th', node);\r
+ try {\r
+ // IE9 might fail to do this selection \r
+ inst.selection.setCursorLocation(tdorth[0], 0);\r
+ } catch (ex) {\r
+ // Ignore\r
+ }\r
+\r
+ dom.setAttrib(node, 'data-mce-new', '');\r
+ });\r
+\r
inst.addVisual();\r
- inst.execCommand('mceEndUndoLevel');\r
+ inst.execCommand('mceEndUndoLevel', false, {}, {skip_undo: true});\r
\r
tinyMCEPopup.close();\r
}\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
style = dom.serializeStyle(st);\r
dir = dom.getAttrib(elm, 'dir');\r
lang = dom.getAttrib(elm, 'lang');\r
- background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");\r
+ background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");\r
formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;\r
\r
orgTableWidth = width;\r
\r
// Update form\r
selectByValue(formObj, 'align', align);\r
- selectByValue(formObj, 'frame', frame);\r
+ selectByValue(formObj, 'tframe', frame);\r
selectByValue(formObj, 'rules', rules);\r
selectByValue(formObj, 'class', className, true, true);\r
formObj.cols.value = cols;\r
formObj.style.value = dom.serializeStyle(st);\r
}\r
\r
+function isCssSize(value) {\r
+ return /^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)$/.test(value);\r
+}\r
+\r
+function cssSize(value, def) {\r
+ value = tinymce.trim(value || def);\r
+\r
+ if (!isCssSize(value)) {\r
+ return parseInt(value, 10) + 'px';\r
+ }\r
+\r
+ return value;\r
+}\r
+\r
function changedBackgroundImage() {\r
var formObj = document.forms[0];\r
var st = dom.parseStyle(formObj.style.value);\r
var st = dom.parseStyle(formObj.style.value);\r
\r
// Update border width if the element has a color\r
- if (formObj.border.value != "" && formObj.bordercolor.value != "")\r
- st['border-width'] = formObj.border.value + "px";\r
+ if (formObj.border.value != "" && (isCssSize(formObj.border.value) || formObj.bordercolor.value != ""))\r
+ st['border-width'] = cssSize(formObj.border.value);\r
+ else {\r
+ if (!formObj.border.value) {\r
+ st['border'] = '';\r
+ st['border-width'] = '';\r
+ }\r
+ }\r
\r
formObj.style.value = dom.serializeStyle(st);\r
}\r
\r
// Add border-width if it's missing\r
if (!st['border-width'])\r
- st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";\r
+ st['border-width'] = cssSize(formObj.border.value, 1);\r
}\r
\r
formObj.style.value = dom.serializeStyle(st);\r
var st = dom.parseStyle(formObj.style.value);\r
\r
if (st['background-image'])\r
- formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");\r
+ formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");\r
else\r
formObj.backgroundimage.value = '';\r
\r
projects / citadel.git / blobdiff