Skip to content
Snippets Groups Projects

Update table plugin row and cell to not use deprecated attributes

Merged Nick Barry requested to merge nbarry10/TinyMCE:master into master
+ 47
4
Compare changes
  • Side-by-side
  • Inline
Files
+ 23
2
@@ -18,7 +18,13 @@ function init() {
// Get table cell data
var celltype = tdElm.nodeName.toLowerCase();
var align = ed.dom.getAttrib(tdElm, 'align');
if (getStyle(tdElm, 'text-align', 'text-align') != "") {
align = getStyle(tdElm, 'text-align', 'text-align');
}
var valign = ed.dom.getAttrib(tdElm, 'valign');
if (getStyle(tdElm, 'vertical-align', 'vertical-align') != "") {
valign = getStyle(tdElm, 'vertical-align', 'vertical-align');
}
var width = trimSize(getStyle(tdElm, 'width', 'width'));
var height = trimSize(getStyle(tdElm, 'height', 'height'));
var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
@@ -201,8 +207,8 @@ function updateCell(td, skip_id) {
if (!skip_id)
dom.setAttrib(td, 'id', formObj.id.value);
dom.setAttrib(td, 'align', formObj.align.value);
dom.setAttrib(td, 'vAlign', formObj.valign.value);
// dom.setAttrib(td, 'align', formObj.align.value);
// dom.setAttrib(td, 'vAlign', formObj.valign.value);
dom.setAttrib(td, 'lang', formObj.lang.value);
dom.setAttrib(td, 'dir', getSelectValue(formObj, 'dir'));
dom.setAttrib(td, 'style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
@@ -215,10 +221,25 @@ function updateCell(td, skip_id) {
ed.dom.setAttrib(td, 'bgColor', '');
ed.dom.setAttrib(td, 'borderColor', '');
ed.dom.setAttrib(td, 'background', '');
ed.dom.setAttrib(td, 'align', '');
ed.dom.setAttrib(td, 'vAlign', '');
// Set styles
td.style.width = getCSSSize(formObj.width.value);
td.style.height = getCSSSize(formObj.height.value);
if (formObj.align.value != "") {
td.style.textAlign = formObj.align.value;
} else {
td.style.textAlign = '';
}
if (formObj.valign.value != "") {
td.style.verticalAlign = formObj.valign.value;
} else {
td.style.verticalAlign = '';
}
if (formObj.bordercolor.value != "") {
td.style.borderColor = formObj.bordercolor.value;
td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
Loading