src/crypto.c: possible fix for memory leak related

[citadel.git] / webcit / tiny_mce / plugins / table / jscripts / cell.js

diff --git a/webcit/tiny_mce/plugins/table/jscripts/cell.js b/webcit/tiny_mce/plugins/table/jscripts/cell.js
index 1dfa9176e4988d46a3e7ce4292c17115b49dc97f..436eaad1711c6e423e0d92401b3f784177678cce 100644 (file)
--- a/webcit/tiny_mce/plugins/table/jscripts/cell.js
+++ b/webcit/tiny_mce/plugins/table/jscripts/cell.js
@@ -1,10 +1,14 @@
 function init() {\r
        tinyMCEPopup.resizeToInnerSize();\r
 \r
+       document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');\r
+       document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');\r
+       document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')\r
+\r
        var inst = tinyMCE.selectedInstance;\r
        var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th");\r
        var formObj = document.forms[0];\r
-       var st = tinyMCE.parseStyle(tdElm.style.cssText);\r
+       var st = tinyMCE.parseStyle(tinyMCE.getAttrib(tdElm, "style"));\r
 \r
        // Get table cell data\r
        var celltype = tdElm.nodeName.toLowerCase();\r
@@ -47,6 +51,8 @@ function init() {
 }\r
 \r
 function updateAction() {\r
+       tinyMCEPopup.restoreSelection();\r
+\r
        var inst = tinyMCE.selectedInstance;\r
        var tdElm = tinyMCE.getParentElement(inst.getFocusElement(), "td,th");\r
        var trElm = tinyMCE.getParentElement(inst.getFocusElement(), "tr");\r
@@ -76,9 +82,12 @@ function updateAction() {
                case "row":\r
                        var cell = trElm.firstChild;\r
 \r
+                       if (cell.nodeName != "TD" && cell.nodeName != "TH")\r
+                               cell = nextCell(cell);\r
+\r
                        do {\r
                                cell = updateCell(cell, true);\r
-                       } while ((cell = nextCell(cell)));\r
+                       } while ((cell = nextCell(cell)) != null);\r
 \r
                        break;\r
 \r
@@ -88,9 +97,12 @@ function updateAction() {
                        for (var i=0; i<rows.length; i++) {\r
                                var cell = rows[i].firstChild;\r
 \r
+                               if (cell.nodeName != "TD" && cell.nodeName != "TH")\r
+                                       cell = nextCell(cell);\r
+\r
                                do {\r
                                        cell = updateCell(cell, true);\r
-                               } while ((cell = nextCell(cell)));\r
+                               } while ((cell = nextCell(cell)) != null);\r
                        }\r
 \r
                        break;\r
@@ -103,7 +115,7 @@ function updateAction() {
 }\r
 \r
 function nextCell(elm) {\r
-       while ((elm = elm.nextSibling)) {\r
+       while ((elm = elm.nextSibling) != null) {\r
                if (elm.nodeName == "TD" || elm.nodeName == "TH")\r
                        return elm;\r
        }\r
@@ -157,9 +169,8 @@ function updateCell(td, skip_id) {
                // changing to a different node type\r
                var newCell = doc.createElement(celltype);\r
 \r
-               for (var c=0; c<td.childNodes.length; c++) {\r
+               for (var c=0; c<td.childNodes.length; c++)\r
                        newCell.appendChild(td.childNodes[c].cloneNode(1));\r
-               }\r
 \r
                for (var a=0; a<td.attributes.length; a++) {\r
                        var attr = td.attributes[a];\r
@@ -168,8 +179,6 @@ function updateCell(td, skip_id) {
 \r
                td.parentNode.replaceChild(newCell, td);\r
                td = newCell;\r
-\r
-               return newCell;\r
        }\r
 \r
        return td;\r