Changeset 828
- Timestamp:
- 2007-09-15 17:43:35 (15 months ago)
- Location:
- FCKeditor/trunk
- Files:
-
- 2 modified
-
editor/_source/commandclasses/fcktextcolorcommand.js (modified) (3 diffs)
-
_whatsnew.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
FCKeditor/trunk/editor/_source/commandclasses/fcktextcolorcommand.js
r779 r828 49 49 FCKTextColorCommand.prototype.Execute = function( panelX, panelY, relElement ) 50 50 { 51 // We must "cache" the actual panel type to be used in the SetColor method.52 FCK._ActiveColorPanelType = this.Type ;53 54 51 // Show the Color Panel at the desired position. 55 52 this._Panel.Show( panelX, panelY, relElement ) ; … … 59 56 { 60 57 var style = FCKStyles.GetStyle( '_FCK_' + 61 ( FCK._ActiveColorPanelType == 'ForeColor' ? 'Color' : 'BackColor' ) ) ;58 ( this.Type == 'ForeColor' ? 'Color' : 'BackColor' ) ) ; 62 59 63 60 if ( !color || color.length == 0 ) … … 68 65 FCKStyles.ApplyStyle( style ) ; 69 66 } 70 71 // Delete the "cached" active panel type.72 delete FCK._ActiveColorPanelType ;73 67 } 74 68 -
FCKeditor/trunk/_whatsnew.html
r825 r828 219 219 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/525">#525</a>] The union 220 220 if successive DIVs will work properly now if EnterMode!=div.</li> 221 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1227">#1227</a>] The color 222 commands used an unnecessary temporary variable. Thanks to Matthias Miller</li> 221 223 </ul> 222 224 <h3>