Fixed case where HTML comments were getting stripped when opening tag not followed by whitespace (<!--foo--> was stripped, <!-- foo --> was not, neither is stripped now)
+ − function init() {
+ − tinyMCEPopup.resizeToInnerSize();
+ −
+ − document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+ − document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+ − document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
+ −
+ − var inst = tinyMCE.selectedInstance;
+ − var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th");
+ − var formObj = document.forms[0];
+ − var st = tinyMCE.parseStyle(tinyMCE.getAttrib(tdElm, "style"));
+ −
+ − // Get table cell data
+ − var celltype = tdElm.nodeName.toLowerCase();
+ − var align = tinyMCE.getAttrib(tdElm, 'align');
+ − var valign = tinyMCE.getAttrib(tdElm, 'valign');
+ − var width = trimSize(getStyle(tdElm, 'width', 'width'));
+ − var height = trimSize(getStyle(tdElm, 'height', 'height'));
+ − var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
+ − var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
+ − var className = tinyMCE.getVisualAidClass(tinyMCE.getAttrib(tdElm, 'class'), false);
+ − var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+ − var id = tinyMCE.getAttrib(tdElm, 'id');
+ − var lang = tinyMCE.getAttrib(tdElm, 'lang');
+ − var dir = tinyMCE.getAttrib(tdElm, 'dir');
+ − var scope = tinyMCE.getAttrib(tdElm, 'scope');
+ −
+ − // Setup form
+ − addClassesToList('class', 'table_cell_styles');
+ − formObj.bordercolor.value = bordercolor;
+ − formObj.bgcolor.value = bgcolor;
+ − formObj.backgroundimage.value = backgroundimage;
+ − formObj.width.value = width;
+ − formObj.height.value = height;
+ − formObj.id.value = id;
+ − formObj.lang.value = lang;
+ − formObj.style.value = tinyMCE.serializeStyle(st);
+ − selectByValue(formObj, 'align', align);
+ − selectByValue(formObj, 'valign', valign);
+ − selectByValue(formObj, 'class', className);
+ − selectByValue(formObj, 'celltype', celltype);
+ − selectByValue(formObj, 'dir', dir);
+ − selectByValue(formObj, 'scope', scope);
+ −
+ − // Resize some elements
+ − if (isVisible('backgroundimagebrowser'))
+ − document.getElementById('backgroundimage').style.width = '180px';
+ −
+ − updateColor('bordercolor_pick', 'bordercolor');
+ − updateColor('bgcolor_pick', 'bgcolor');
+ − }
+ −
+ − function updateAction() {
+ − tinyMCEPopup.restoreSelection();
+ −
+ − var inst = tinyMCE.selectedInstance;
+ − var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th");
+ − var trElm = tinyMCE.getParentElement(inst.getFocusElement(), "tr");
+ − var tableElm = tinyMCE.getParentElement(inst.getFocusElement(), "table");
+ − var formObj = document.forms[0];
+ −
+ − inst.execCommand('mceBeginUndoLevel');
+ −
+ − switch (getSelectValue(formObj, 'action')) {
+ − case "cell":
+ − var celltype = getSelectValue(formObj, 'celltype');
+ − var scope = getSelectValue(formObj, 'scope');
+ −
+ − if (tinyMCE.getParam("accessibility_warnings")) {
+ − if (celltype == "th" && scope == "")
+ − var answer = confirm(tinyMCE.getLang('lang_table_missing_scope', '', true));
+ − else
+ − var answer = true;
+ −
+ − if (!answer)
+ − return;
+ − }
+ −
+ − updateCell(tdElm);
+ − break;
+ −
+ − case "row":
+ − var cell = trElm.firstChild;
+ −
+ − if (cell.nodeName != "TD" && cell.nodeName != "TH")
+ − cell = nextCell(cell);
+ −
+ − do {
+ − cell = updateCell(cell, true);
+ − } while ((cell = nextCell(cell)) != null);
+ −
+ − break;
+ −
+ − case "all":
+ − var rows = tableElm.getElementsByTagName("tr");
+ −
+ − for (var i=0; i<rows.length; i++) {
+ − var cell = rows[i].firstChild;
+ −
+ − if (cell.nodeName != "TD" && cell.nodeName != "TH")
+ − cell = nextCell(cell);
+ −
+ − do {
+ − cell = updateCell(cell, true);
+ − } while ((cell = nextCell(cell)) != null);
+ − }
+ −
+ − break;
+ − }
+ −
+ − tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
+ − tinyMCE.triggerNodeChange();
+ − inst.execCommand('mceEndUndoLevel');
+ − tinyMCEPopup.close();
+ − }
+ −
+ − function nextCell(elm) {
+ − while ((elm = elm.nextSibling) != null) {
+ − if (elm.nodeName == "TD" || elm.nodeName == "TH")
+ − return elm;
+ − }
+ −
+ − return null;
+ − }
+ −
+ − function updateCell(td, skip_id) {
+ − var inst = tinyMCE.selectedInstance;
+ − var formObj = document.forms[0];
+ − var curCellType = td.nodeName.toLowerCase();
+ − var celltype = getSelectValue(formObj, 'celltype');
+ − var doc = inst.getDoc();
+ −
+ − if (!skip_id)
+ − td.setAttribute('id', formObj.id.value);
+ −
+ − td.setAttribute('align', formObj.align.value);
+ − td.setAttribute('vAlign', formObj.valign.value);
+ − td.setAttribute('lang', formObj.lang.value);
+ − td.setAttribute('dir', getSelectValue(formObj, 'dir'));
+ − td.setAttribute('style', tinyMCE.serializeStyle(tinyMCE.parseStyle(formObj.style.value)));
+ − td.setAttribute('scope', formObj.scope.value);
+ − tinyMCE.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+ −
+ − // Clear deprecated attributes
+ − tinyMCE.setAttrib(td, 'width', '');
+ − tinyMCE.setAttrib(td, 'height', '');
+ − tinyMCE.setAttrib(td, 'bgColor', '');
+ − tinyMCE.setAttrib(td, 'borderColor', '');
+ − tinyMCE.setAttrib(td, 'background', '');
+ −
+ − // Set styles
+ − td.style.width = getCSSSize(formObj.width.value);
+ − td.style.height = getCSSSize(formObj.height.value);
+ − if (formObj.bordercolor.value != "") {
+ − td.style.borderColor = formObj.bordercolor.value;
+ − td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
+ − td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
+ − } else
+ − td.style.borderColor = '';
+ −
+ − td.style.backgroundColor = formObj.bgcolor.value;
+ −
+ − if (formObj.backgroundimage.value != "")
+ − td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+ − else
+ − td.style.backgroundImage = '';
+ −
+ − if (curCellType != celltype) {
+ − // changing to a different node type
+ − var newCell = doc.createElement(celltype);
+ −
+ − for (var c=0; c<td.childNodes.length; c++)
+ − newCell.appendChild(td.childNodes[c].cloneNode(1));
+ −
+ − for (var a=0; a<td.attributes.length; a++) {
+ − var attr = td.attributes[a];
+ − newCell.setAttribute(attr.name, attr.value);
+ − }
+ −
+ − td.parentNode.replaceChild(newCell, td);
+ − td = newCell;
+ − }
+ −
+ − return td;
+ − }
+ −
+ − function changedBackgroundImage() {
+ − var formObj = document.forms[0];
+ − var st = tinyMCE.parseStyle(formObj.style.value);
+ −
+ − st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+ −
+ − formObj.style.value = tinyMCE.serializeStyle(st);
+ − }
+ −
+ − function changedSize() {
+ − var formObj = document.forms[0];
+ − var st = tinyMCE.parseStyle(formObj.style.value);
+ −
+ − var width = formObj.width.value;
+ − if (width != "")
+ − st['width'] = getCSSSize(width);
+ − else
+ − st['width'] = "";
+ −
+ − var height = formObj.height.value;
+ − if (height != "")
+ − st['height'] = getCSSSize(height);
+ − else
+ − st['height'] = "";
+ −
+ − formObj.style.value = tinyMCE.serializeStyle(st);
+ − }
+ −
+ − function changedColor() {
+ − var formObj = document.forms[0];
+ − var st = tinyMCE.parseStyle(formObj.style.value);
+ −
+ − st['background-color'] = formObj.bgcolor.value;
+ − st['border-color'] = formObj.bordercolor.value;
+ −
+ − formObj.style.value = tinyMCE.serializeStyle(st);
+ − }
+ −
+ − function changedStyle() {
+ − var formObj = document.forms[0];
+ − var st = tinyMCE.parseStyle(formObj.style.value);
+ −
+ − if (st['background-image'])
+ − formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+ − else
+ − formObj.backgroundimage.value = '';
+ −
+ − if (st['width'])
+ − formObj.width.value = trimSize(st['width']);
+ −
+ − if (st['height'])
+ − formObj.height.value = trimSize(st['height']);
+ −
+ − if (st['background-color']) {
+ − formObj.bgcolor.value = st['background-color'];
+ − updateColor('bgcolor_pick','bgcolor');
+ − }
+ −
+ − if (st['border-color']) {
+ − formObj.bordercolor.value = st['border-color'];
+ − updateColor('bordercolor_pick','bordercolor');
+ − }
+ − }