Ticket #617: 617.patch
File 617.patch, 2.1 KB (added by , 16 years ago) |
---|
-
editor/dialog/fck_tablecell.html
64 64 if ( oCell.attributes['noWrap'] != null && oCell.attributes['noWrap'].specified ) 65 65 GetE('selWordWrap').value = !oCell.noWrap ; 66 66 67 var sBorderColor = oCell.style.borderColor ; 68 var matchResults = null ; 69 if ( matchResults = sBorderColor.match( /(rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/i ) ) 70 { 71 var red = parseInt( matchResults[2], 10 ).toString( 16 ), 72 green = parseInt( matchResults[3], 10 ).toString( 16 ), 73 blue = parseInt( matchResults[4], 10 ).toString( 16 ) ; 74 sBorderColor = '#' + [red, green, blue].join( '' ) ; 75 } 76 67 77 GetE('txtWidth').value = iWidth ; 68 78 GetE('txtHeight').value = GetAttribute( oCell, 'height' ) ; 69 79 GetE('selHAlign').value = GetAttribute( oCell, 'align' ) ; … … 71 81 GetE('txtRowSpan').value = GetAttribute( oCell, 'rowSpan' ) ; 72 82 GetE('txtCollSpan').value = GetAttribute( oCell, 'colSpan' ) ; 73 83 GetE('txtBackColor').value = GetAttribute( oCell, 'bgColor' ) ; 74 GetE('txtBorderColor').value = GetAttribute( oCell, 'borderColor' );84 GetE('txtBorderColor').value = sBorderColor ; 75 85 // GetE('cmbFontStyle').value = oCell.className ; 76 86 } 77 87 } … … 97 107 SetAttribute( aCells[i], 'rowSpan' , GetE('txtRowSpan').value ) ; 98 108 SetAttribute( aCells[i], 'colSpan' , GetE('txtCollSpan').value ) ; 99 109 SetAttribute( aCells[i], 'bgColor' , GetE('txtBackColor').value ) ; 100 SetAttribute( aCells[i], 'borderColor' , GetE('txtBorderColor').value ) ; 110 111 var sBorderColor = GetE( 'txtBorderColor' ).value ; 112 if ( sBorderColor.length > 0 ) 113 { 114 oEditor.FCKDomTools.SetElementStyles( aCells[i], 115 { 116 'borderColor' : sBorderColor, 117 'borderWidth' : '1px', 118 'borderStyle' : 'solid' 119 } ) ; 120 } 121 else 122 aCells[i].style.border = 'default' ; 101 123 // SetAttribute( aCells[i], 'className' , GetE('cmbFontStyle').value ) ; 102 124 } 103 125