Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_ice_tables/export2html.js =================================================================== diff -u -rc83cefc8bdfd1eb8860c4d8c56b1468d0eea5079 -r79393fff08fc2637a75f71b31cf52228ee17fba3 --- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_ice_tables/export2html.js (.../export2html.js) (revision c83cefc8bdfd1eb8860c4d8c56b1468d0eea5079) +++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_ice_tables/export2html.js (.../export2html.js) (revision 79393fff08fc2637a75f71b31cf52228ee17fba3) @@ -6,6 +6,10 @@ var attribIndex = retrieveIndex(context.attribLine); if (attribIndex) { var dtAttrs = context.apool.numToAttrib[attribIndex][1]; + if(dtAttrs[0] != '{') { + // LAMS: discard non-JSON attributes + dtAttrs = null; + } context.lineContent = DatatablesRendererExport.DatatablesRenderer.render("export", context, dtAttrs); context.text = context.lineContent; } Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_ice_tables/static/js/datatables-renderer.js =================================================================== diff -u -r6946c68b5b9aa12ff981659d94ecb5917552fdb8 -r79393fff08fc2637a75f71b31cf52228ee17fba3 --- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_ice_tables/static/js/datatables-renderer.js (.../datatables-renderer.js) (revision 6946c68b5b9aa12ff981659d94ecb5917552fdb8) +++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_ice_tables/static/js/datatables-renderer.js (.../datatables-renderer.js) (revision 79393fff08fc2637a75f71b31cf52228ee17fba3) @@ -31,6 +31,7 @@ // element = element.children[0]; // console.log("getting child element", element.innerHTML, element); // } + return element.innerHTML; } }; // end of dRenderer @@ -82,7 +83,6 @@ var rows = tblJSONObj.payload; var evenRowBgColor = typeof (rowAttrs) == 'undefined' || rowAttrs == null ? "#FFFFFF" : rowAttrs.evenBgColor || "#FFFFFF"; var oddRowBgColor = typeof (rowAttrs) == 'undefined' || rowAttrs == null ? null : rowAttrs.oddBgColor || null; - // the tables contains only one row, no need to do a FOR for (var j = 0, rl = rows.length; j < rl; j++) { var tds = rows[j]; @@ -212,6 +212,7 @@ try { JSONCode = JSON.parse(code); tblProperties = JSONCode.tblProperties; + otherProps = attributes ? JSON.parse(attributes) : null; if (tblProperties && attributes) { @@ -222,7 +223,9 @@ tblProperties = JSON.parse(attributes); } html = this.buildTabularData(JSONCode, tblProperties, renderingContext); - } catch (error) {} + } catch (error) { + console.log('tables getHtml error: ' + error); + } return html; }, };