Ticket #617: fck_tablecell.html.patch

fck_tablecell.html

@@ -64 +64 @@
                 if ( oCell.attributes['noWrap'] != null && oCell.attributes['noWrap'].specified )
                         GetE('selWordWrap').value = !oCell.noWrap ;
 
+                if (oCell.style['borderColor'].search('rgb') != -1)
+                        var sBorderColor = oCell.style['borderColor'].match(/rgb\([^)]*\)/i);
+                else 
+                    var sBorderColor = oCell.style['borderColor'];
+
                 GetE('txtWidth').value                  = iWidth ;
                 GetE('txtHeight').value                 = GetAttribute( oCell, 'height' ) ;
                 GetE('selHAlign').value                 = GetAttribute( oCell, 'align' ) ;
@@ -71 +76 @@
                 GetE('txtRowSpan').value                = GetAttribute( oCell, 'rowSpan' ) ;
                 GetE('txtCollSpan').value               = GetAttribute( oCell, 'colSpan' ) ;
                 GetE('txtBackColor').value              = GetAttribute( oCell, 'bgColor' ) ;
-                GetE('txtBorderColor').value    = GetAttribute( oCell, 'borderColor' ) ;
+                GetE('txtBorderColor').value    = sBorderColor ;
 //              GetE('cmbFontStyle').value              = oCell.className ;
         }
 }
@@ -91 +96 @@
                 else
                         aCells[i].removeAttribute( 'noWrap' ) ;
 
+                aCells[i].style['borderColor'] = GetE('txtBorderColor').value;
+
                 SetAttribute( aCells[i], 'height'               , GetE('txtHeight').value ) ;
                 SetAttribute( aCells[i], 'align'                , GetE('selHAlign').value ) ;
                 SetAttribute( aCells[i], 'vAlign'               , GetE('selVAlign').value ) ;
                 SetAttribute( aCells[i], 'rowSpan'              , GetE('txtRowSpan').value ) ;
                 SetAttribute( aCells[i], 'colSpan'              , GetE('txtCollSpan').value ) ;
                 SetAttribute( aCells[i], 'bgColor'              , GetE('txtBackColor').value ) ;
-                SetAttribute( aCells[i], 'borderColor'  , GetE('txtBorderColor').value ) ;
 //              SetAttribute( aCells[i], 'className'    , GetE('cmbFontStyle').value ) ;
         }